clang-format all core files

16 files changed, 1158 insertions, 1318 deletions

diff --git a/test/core/end2end/fixtures/h2_compress.c b/test/core/end2end/fixtures/h2_compress.c
index 7117777bfa..6e7a1faf55 100644
--- a/test/core/end2end/fixtures/h2_compress.c
+++ b/test/core/end2end/fixtures/h2_compress.c
@@ -51,94 +51,86 @@
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
-typedef struct fullstack_compression_fixture_data
-{
+typedef struct fullstack_compression_fixture_data {
   char *localaddr;
   grpc_channel_args *client_args_compression;
   grpc_channel_args *server_args_compression;
 } fullstack_compression_fixture_data;
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_fullstack_compression (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_fullstack_compression(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  int port = grpc_pick_unused_port_or_die ();
-  fullstack_compression_fixture_data *ffd = gpr_malloc (sizeof (fullstack_compression_fixture_data));
-  memset (ffd, 0, sizeof (fullstack_compression_fixture_data));
+  int port = grpc_pick_unused_port_or_die();
+  fullstack_compression_fixture_data *ffd =
+      gpr_malloc(sizeof(fullstack_compression_fixture_data));
+  memset(ffd, 0, sizeof(fullstack_compression_fixture_data));
 
-  gpr_join_host_port (&ffd->localaddr, "localhost", port);
+  gpr_join_host_port(&ffd->localaddr, "localhost", port);
 
-  memset (&f, 0, sizeof (f));
+  memset(&f, 0, sizeof(f));
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-void
-chttp2_init_client_fullstack_compression (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
+void chttp2_init_client_fullstack_compression(grpc_end2end_test_fixture *f,
+                                              grpc_channel_args *client_args) {
   fullstack_compression_fixture_data *ffd = f->fixture_data;
-  if (ffd->client_args_compression != NULL)
-    {
-      grpc_channel_args_destroy (ffd->client_args_compression);
-    }
-  ffd->client_args_compression = grpc_channel_args_set_compression_algorithm (client_args, GRPC_COMPRESS_GZIP);
-  f->client = grpc_insecure_channel_create (ffd->localaddr, ffd->client_args_compression, NULL);
+  if (ffd->client_args_compression != NULL) {
+    grpc_channel_args_destroy(ffd->client_args_compression);
+  }
+  ffd->client_args_compression = grpc_channel_args_set_compression_algorithm(
+      client_args, GRPC_COMPRESS_GZIP);
+  f->client = grpc_insecure_channel_create(ffd->localaddr,
+                                           ffd->client_args_compression, NULL);
 }
 
-void
-chttp2_init_server_fullstack_compression (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
+void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture *f,
+                                              grpc_channel_args *server_args) {
   fullstack_compression_fixture_data *ffd = f->fixture_data;
-  if (ffd->server_args_compression != NULL)
-    {
-      grpc_channel_args_destroy (ffd->server_args_compression);
-    }
-  ffd->server_args_compression = grpc_channel_args_set_compression_algorithm (server_args, GRPC_COMPRESS_GZIP);
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (ffd->server_args_compression, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_insecure_http2_port (f->server, ffd->localaddr));
-  grpc_server_start (f->server);
+  if (ffd->server_args_compression != NULL) {
+    grpc_channel_args_destroy(ffd->server_args_compression);
+  }
+  ffd->server_args_compression = grpc_channel_args_set_compression_algorithm(
+      server_args, GRPC_COMPRESS_GZIP);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(ffd->server_args_compression, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr));
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_fullstack_compression (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture *f) {
   fullstack_compression_fixture_data *ffd = f->fixture_data;
-  grpc_channel_args_destroy (ffd->client_args_compression);
-  grpc_channel_args_destroy (ffd->server_args_compression);
-  gpr_free (ffd->localaddr);
-  gpr_free (ffd);
+  grpc_channel_args_destroy(ffd->client_args_compression);
+  grpc_channel_args_destroy(ffd->server_args_compression);
+  gpr_free(ffd->localaddr);
+  gpr_free(ffd);
 }
 
 /* All test configurations */
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/fullstack_compression", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
-   chttp2_create_fixture_fullstack_compression,
-   chttp2_init_client_fullstack_compression,
-   chttp2_init_server_fullstack_compression,
-   chttp2_tear_down_fullstack_compression},
+    {"chttp2/fullstack_compression", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
+     chttp2_create_fixture_fullstack_compression,
+     chttp2_init_client_fullstack_compression,
+     chttp2_init_server_fullstack_compression,
+     chttp2_tear_down_fullstack_compression},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
 
-  grpc_test_init (argc, argv);
-  grpc_init ();
+  grpc_test_init(argc, argv);
+  grpc_init();
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_fakesec.c b/test/core/end2end/fixtures/h2_fakesec.c
index c663f40ede..3e64cc08e8 100644
--- a/test/core/end2end/fixtures/h2_fakesec.c
+++ b/test/core/end2end/fixtures/h2_fakesec.c
@@ -45,126 +45,119 @@
 #include "test/core/util/port.h"
 #include "test/core/end2end/data/ssl_test_data.h"
 
-typedef struct fullstack_secure_fixture_data
-{
+typedef struct fullstack_secure_fixture_data {
   char *localaddr;
 } fullstack_secure_fixture_data;
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  int port = grpc_pick_unused_port_or_die ();
-  fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data));
+  int port = grpc_pick_unused_port_or_die();
+  fullstack_secure_fixture_data *ffd =
+      gpr_malloc(sizeof(fullstack_secure_fixture_data));
 
-  memset (&f, 0, sizeof (f));
-  gpr_join_host_port (&ffd->localaddr, "localhost", port);
+  memset(&f, 0, sizeof(f));
+  gpr_join_host_port(&ffd->localaddr, "localhost", port);
 
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-static void
-process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data)
-{
-  GPR_ASSERT (state == NULL);
-  cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL);
+static void process_auth_failure(void *state, grpc_auth_context *ctx,
+                                 const grpc_metadata *md, size_t md_count,
+                                 grpc_process_auth_metadata_done_cb cb,
+                                 void *user_data) {
+  GPR_ASSERT(state == NULL);
+  cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL);
 }
 
-static void
-chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds)
-{
+static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f,
+                                                grpc_channel_args *client_args,
+                                                grpc_credentials *creds) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL);
-  GPR_ASSERT (f->client != NULL);
-  grpc_credentials_release (creds);
+  f->client =
+      grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL);
+  GPR_ASSERT(f->client != NULL);
+  grpc_credentials_release(creds);
 }
 
-static void
-chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds)
-{
+static void chttp2_init_server_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *server_args,
+    grpc_server_credentials *server_creds) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (server_args, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds));
-  grpc_server_credentials_release (server_creds);
-  grpc_server_start (f->server);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(server_args, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr,
+                                               server_creds));
+  grpc_server_credentials_release(server_creds);
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  gpr_free (ffd->localaddr);
-  gpr_free (ffd);
+  gpr_free(ffd->localaddr);
+  gpr_free(ffd);
 }
 
-static void
-chttp2_init_client_fake_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
-  grpc_credentials *fake_ts_creds = grpc_fake_transport_security_credentials_create ();
-  chttp2_init_client_secure_fullstack (f, client_args, fake_ts_creds);
+static void chttp2_init_client_fake_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *client_args) {
+  grpc_credentials *fake_ts_creds =
+      grpc_fake_transport_security_credentials_create();
+  chttp2_init_client_secure_fullstack(f, client_args, fake_ts_creds);
 }
 
-static int
-fail_server_auth_check (grpc_channel_args * server_args)
-{
+static int fail_server_auth_check(grpc_channel_args *server_args) {
   size_t i;
-  if (server_args == NULL)
-    return 0;
-  for (i = 0; i < server_args->num_args; i++)
-    {
-      if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0)
-	{
-	  return 1;
-	}
+  if (server_args == NULL) return 0;
+  for (i = 0; i < server_args->num_args; i++) {
+    if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) ==
+        0) {
+      return 1;
     }
+  }
   return 0;
 }
 
-static void
-chttp2_init_server_fake_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
-  grpc_server_credentials *fake_ts_creds = grpc_fake_transport_security_server_credentials_create ();
-  if (fail_server_auth_check (server_args))
-    {
-      grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL };
-      grpc_server_credentials_set_auth_metadata_processor (fake_ts_creds, processor);
-    }
-  chttp2_init_server_secure_fullstack (f, server_args, fake_ts_creds);
+static void chttp2_init_server_fake_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *server_args) {
+  grpc_server_credentials *fake_ts_creds =
+      grpc_fake_transport_security_server_credentials_create();
+  if (fail_server_auth_check(server_args)) {
+    grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL};
+    grpc_server_credentials_set_auth_metadata_processor(fake_ts_creds,
+                                                        processor);
+  }
+  chttp2_init_server_secure_fullstack(f, server_args, fake_ts_creds);
 }
 
 /* All test configurations */
 
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/fake_secure_fullstack",
-   FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS,
-   chttp2_create_fixture_secure_fullstack,
-   chttp2_init_client_fake_secure_fullstack,
-   chttp2_init_server_fake_secure_fullstack,
-   chttp2_tear_down_secure_fullstack},
+    {"chttp2/fake_secure_fullstack",
+     FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION |
+         FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS,
+     chttp2_create_fixture_secure_fullstack,
+     chttp2_init_client_fake_secure_fullstack,
+     chttp2_init_server_fake_secure_fullstack,
+     chttp2_tear_down_secure_fullstack},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
-  grpc_test_init (argc, argv);
+  grpc_test_init(argc, argv);
 
-  grpc_init ();
+  grpc_init();
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_full+poll.c b/test/core/end2end/fixtures/h2_full+poll.c
index 92f49c0bc6..48feefc931 100644
--- a/test/core/end2end/fixtures/h2_full+poll.c
+++ b/test/core/end2end/fixtures/h2_full+poll.c
@@ -50,79 +50,69 @@
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
-typedef struct fullstack_fixture_data
-{
+typedef struct fullstack_fixture_data {
   char *localaddr;
 } fullstack_fixture_data;
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  int port = grpc_pick_unused_port_or_die ();
-  fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data));
-  memset (&f, 0, sizeof (f));
+  int port = grpc_pick_unused_port_or_die();
+  fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data));
+  memset(&f, 0, sizeof(f));
 
-  gpr_join_host_port (&ffd->localaddr, "localhost", port);
+  gpr_join_host_port(&ffd->localaddr, "localhost", port);
 
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-void
-chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
+void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f,
+                                  grpc_channel_args *client_args) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL);
+  f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL);
 }
 
-void
-chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
+void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f,
+                                  grpc_channel_args *server_args) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (server_args, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_insecure_http2_port (f->server, ffd->localaddr));
-  grpc_server_start (f->server);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(server_args, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr));
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  gpr_free (ffd->localaddr);
-  gpr_free (ffd);
+  gpr_free(ffd->localaddr);
+  gpr_free(ffd);
 }
 
 /* All test configurations */
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
-   chttp2_create_fixture_fullstack, chttp2_init_client_fullstack,
-   chttp2_init_server_fullstack, chttp2_tear_down_fullstack},
+    {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
+     chttp2_create_fixture_fullstack, chttp2_init_client_fullstack,
+     chttp2_init_server_fullstack, chttp2_tear_down_fullstack},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
 
   grpc_platform_become_multipoller = grpc_poll_become_multipoller;
 
-  grpc_test_init (argc, argv);
-  grpc_init ();
+  grpc_test_init(argc, argv);
+  grpc_init();
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_full.c b/test/core/end2end/fixtures/h2_full.c
index 16e9359500..0170dcf0e5 100644
--- a/test/core/end2end/fixtures/h2_full.c
+++ b/test/core/end2end/fixtures/h2_full.c
@@ -50,78 +50,68 @@
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
-typedef struct fullstack_fixture_data
-{
+typedef struct fullstack_fixture_data {
   char *localaddr;
 } fullstack_fixture_data;
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  int port = grpc_pick_unused_port_or_die ();
-  fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data));
-  memset (&f, 0, sizeof (f));
+  int port = grpc_pick_unused_port_or_die();
+  fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data));
+  memset(&f, 0, sizeof(f));
 
-  gpr_join_host_port (&ffd->localaddr, "localhost", port);
+  gpr_join_host_port(&ffd->localaddr, "localhost", port);
 
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-void
-chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
+void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f,
+                                  grpc_channel_args *client_args) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL);
-  GPR_ASSERT (f->client);
+  f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL);
+  GPR_ASSERT(f->client);
 }
 
-void
-chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
+void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f,
+                                  grpc_channel_args *server_args) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (server_args, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_insecure_http2_port (f->server, ffd->localaddr));
-  grpc_server_start (f->server);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(server_args, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr));
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  gpr_free (ffd->localaddr);
-  gpr_free (ffd);
+  gpr_free(ffd->localaddr);
+  gpr_free(ffd);
 }
 
 /* All test configurations */
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
-   chttp2_create_fixture_fullstack, chttp2_init_client_fullstack,
-   chttp2_init_server_fullstack, chttp2_tear_down_fullstack},
+    {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
+     chttp2_create_fixture_fullstack, chttp2_init_client_fullstack,
+     chttp2_init_server_fullstack, chttp2_tear_down_fullstack},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
 
-  grpc_test_init (argc, argv);
-  grpc_init ();
+  grpc_test_init(argc, argv);
+  grpc_init();
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_oauth2.c b/test/core/end2end/fixtures/h2_oauth2.c
index a328eb1ed5..b4b2e02684 100644
--- a/test/core/end2end/fixtures/h2_oauth2.c
+++ b/test/core/end2end/fixtures/h2_oauth2.c
@@ -50,201 +50,191 @@ static const char oauth2_md[] = "Bearer aaslkfjs424535asdf";
 static const char *client_identity_property_name = "smurf_name";
 static const char *client_identity = "Brainy Smurf";
 
-typedef struct fullstack_secure_fixture_data
-{
+typedef struct fullstack_secure_fixture_data {
   char *localaddr;
 } fullstack_secure_fixture_data;
 
-static const grpc_metadata *
-find_metadata (const grpc_metadata * md, size_t md_count, const char *key, const char *value)
-{
+static const grpc_metadata *find_metadata(const grpc_metadata *md,
+                                          size_t md_count, const char *key,
+                                          const char *value) {
   size_t i;
-  for (i = 0; i < md_count; i++)
-    {
-      if (strcmp (key, md[i].key) == 0 && strlen (value) == md[i].value_length && memcmp (md[i].value, value, md[i].value_length) == 0)
-	{
-	  return &md[i];
-	}
+  for (i = 0; i < md_count; i++) {
+    if (strcmp(key, md[i].key) == 0 && strlen(value) == md[i].value_length &&
+        memcmp(md[i].value, value, md[i].value_length) == 0) {
+      return &md[i];
     }
+  }
   return NULL;
 }
 
-typedef struct
-{
-  size_t pseudo_refcount;
-} test_processor_state;
+typedef struct { size_t pseudo_refcount; } test_processor_state;
 
-static void
-process_oauth2_success (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data)
-{
-  const grpc_metadata *oauth2 = find_metadata (md, md_count, "Authorization", oauth2_md);
+static void process_oauth2_success(void *state, grpc_auth_context *ctx,
+                                   const grpc_metadata *md, size_t md_count,
+                                   grpc_process_auth_metadata_done_cb cb,
+                                   void *user_data) {
+  const grpc_metadata *oauth2 =
+      find_metadata(md, md_count, "Authorization", oauth2_md);
   test_processor_state *s;
 
-  GPR_ASSERT (state != NULL);
-  s = (test_processor_state *) state;
-  GPR_ASSERT (s->pseudo_refcount == 1);
-  GPR_ASSERT (oauth2 != NULL);
-  grpc_auth_context_add_cstring_property (ctx, client_identity_property_name, client_identity);
-  GPR_ASSERT (grpc_auth_context_set_peer_identity_property_name (ctx, client_identity_property_name) == 1);
-  cb (user_data, oauth2, 1, NULL, 0, GRPC_STATUS_OK, NULL);
+  GPR_ASSERT(state != NULL);
+  s = (test_processor_state *)state;
+  GPR_ASSERT(s->pseudo_refcount == 1);
+  GPR_ASSERT(oauth2 != NULL);
+  grpc_auth_context_add_cstring_property(ctx, client_identity_property_name,
+                                         client_identity);
+  GPR_ASSERT(grpc_auth_context_set_peer_identity_property_name(
+                 ctx, client_identity_property_name) == 1);
+  cb(user_data, oauth2, 1, NULL, 0, GRPC_STATUS_OK, NULL);
 }
 
-static void
-process_oauth2_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data)
-{
-  const grpc_metadata *oauth2 = find_metadata (md, md_count, "Authorization", oauth2_md);
+static void process_oauth2_failure(void *state, grpc_auth_context *ctx,
+                                   const grpc_metadata *md, size_t md_count,
+                                   grpc_process_auth_metadata_done_cb cb,
+                                   void *user_data) {
+  const grpc_metadata *oauth2 =
+      find_metadata(md, md_count, "Authorization", oauth2_md);
   test_processor_state *s;
-  GPR_ASSERT (state != NULL);
-  s = (test_processor_state *) state;
-  GPR_ASSERT (s->pseudo_refcount == 1);
-  GPR_ASSERT (oauth2 != NULL);
-  cb (user_data, oauth2, 1, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL);
+  GPR_ASSERT(state != NULL);
+  s = (test_processor_state *)state;
+  GPR_ASSERT(s->pseudo_refcount == 1);
+  GPR_ASSERT(oauth2 != NULL);
+  cb(user_data, oauth2, 1, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL);
 }
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  int port = grpc_pick_unused_port_or_die ();
-  fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data));
-  memset (&f, 0, sizeof (f));
+  int port = grpc_pick_unused_port_or_die();
+  fullstack_secure_fixture_data *ffd =
+      gpr_malloc(sizeof(fullstack_secure_fixture_data));
+  memset(&f, 0, sizeof(f));
 
-  gpr_join_host_port (&ffd->localaddr, "localhost", port);
+  gpr_join_host_port(&ffd->localaddr, "localhost", port);
 
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-static void
-chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds)
-{
+static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f,
+                                                grpc_channel_args *client_args,
+                                                grpc_credentials *creds) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL);
-  GPR_ASSERT (f->client != NULL);
-  grpc_credentials_release (creds);
+  f->client =
+      grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL);
+  GPR_ASSERT(f->client != NULL);
+  grpc_credentials_release(creds);
 }
 
-static void
-chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds)
-{
+static void chttp2_init_server_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *server_args,
+    grpc_server_credentials *server_creds) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (server_args, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds));
-  grpc_server_credentials_release (server_creds);
-  grpc_server_start (f->server);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(server_args, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr,
+                                               server_creds));
+  grpc_server_credentials_release(server_creds);
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  gpr_free (ffd->localaddr);
-  gpr_free (ffd);
+  gpr_free(ffd->localaddr);
+  gpr_free(ffd);
 }
 
-static void
-chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
-  grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL);
-  grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", oauth2_md, 1);
-  grpc_credentials *ssl_oauth2_creds = grpc_composite_credentials_create (ssl_creds, oauth2_creds, NULL);
-  grpc_arg ssl_name_override = { GRPC_ARG_STRING,
-    GRPC_SSL_TARGET_NAME_OVERRIDE_ARG,
-    {"foo.test.google.fr"}
-  };
-  grpc_channel_args *new_client_args = grpc_channel_args_copy_and_add (client_args, &ssl_name_override, 1);
-  chttp2_init_client_secure_fullstack (f, new_client_args, ssl_oauth2_creds);
-  grpc_channel_args_destroy (new_client_args);
-  grpc_credentials_release (ssl_creds);
-  grpc_credentials_release (oauth2_creds);
+static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *client_args) {
+  grpc_credentials *ssl_creds =
+      grpc_ssl_credentials_create(test_root_cert, NULL, NULL);
+  grpc_credentials *oauth2_creds =
+      grpc_md_only_test_credentials_create("Authorization", oauth2_md, 1);
+  grpc_credentials *ssl_oauth2_creds =
+      grpc_composite_credentials_create(ssl_creds, oauth2_creds, NULL);
+  grpc_arg ssl_name_override = {GRPC_ARG_STRING,
+                                GRPC_SSL_TARGET_NAME_OVERRIDE_ARG,
+                                {"foo.test.google.fr"}};
+  grpc_channel_args *new_client_args =
+      grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1);
+  chttp2_init_client_secure_fullstack(f, new_client_args, ssl_oauth2_creds);
+  grpc_channel_args_destroy(new_client_args);
+  grpc_credentials_release(ssl_creds);
+  grpc_credentials_release(oauth2_creds);
 }
 
-static int
-fail_server_auth_check (grpc_channel_args * server_args)
-{
+static int fail_server_auth_check(grpc_channel_args *server_args) {
   size_t i;
-  if (server_args == NULL)
-    return 0;
-  for (i = 0; i < server_args->num_args; i++)
-    {
-      if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0)
-	{
-	  return 1;
-	}
+  if (server_args == NULL) return 0;
+  for (i = 0; i < server_args->num_args; i++) {
+    if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) ==
+        0) {
+      return 1;
     }
+  }
   return 0;
 }
 
-static void
-processor_destroy (void *state)
-{
-  test_processor_state *s = (test_processor_state *) state;
-  GPR_ASSERT ((s->pseudo_refcount--) == 1);
-  gpr_free (s);
+static void processor_destroy(void *state) {
+  test_processor_state *s = (test_processor_state *)state;
+  GPR_ASSERT((s->pseudo_refcount--) == 1);
+  gpr_free(s);
 }
 
-static grpc_auth_metadata_processor
-test_processor_create (int failing)
-{
-  test_processor_state *s = gpr_malloc (sizeof (*s));
+static grpc_auth_metadata_processor test_processor_create(int failing) {
+  test_processor_state *s = gpr_malloc(sizeof(*s));
   grpc_auth_metadata_processor result;
   s->pseudo_refcount = 1;
   result.state = s;
   result.destroy = processor_destroy;
-  if (failing)
-    {
-      result.process = process_oauth2_failure;
-    }
-  else
-    {
-      result.process = process_oauth2_success;
-    }
+  if (failing) {
+    result.process = process_oauth2_failure;
+  } else {
+    result.process = process_oauth2_success;
+  }
   return result;
 }
 
-static void
-chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
-  grpc_ssl_pem_key_cert_pair pem_key_cert_pair = { test_server1_key,
-    test_server1_cert
-  };
-  grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_key_cert_pair, 1, 0, NULL);
-  grpc_server_credentials_set_auth_metadata_processor (ssl_creds, test_processor_create (fail_server_auth_check (server_args)));
-  chttp2_init_server_secure_fullstack (f, server_args, ssl_creds);
+static void chttp2_init_server_simple_ssl_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *server_args) {
+  grpc_ssl_pem_key_cert_pair pem_key_cert_pair = {test_server1_key,
+                                                  test_server1_cert};
+  grpc_server_credentials *ssl_creds =
+      grpc_ssl_server_credentials_create(NULL, &pem_key_cert_pair, 1, 0, NULL);
+  grpc_server_credentials_set_auth_metadata_processor(
+      ssl_creds, test_processor_create(fail_server_auth_check(server_args)));
+  chttp2_init_server_secure_fullstack(f, server_args, ssl_creds);
 }
 
 /* All test configurations */
 
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/simple_ssl_with_oauth2_fullstack",
-   FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS,
-   chttp2_create_fixture_secure_fullstack,
-   chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack,
-   chttp2_init_server_simple_ssl_secure_fullstack,
-   chttp2_tear_down_secure_fullstack},
+    {"chttp2/simple_ssl_with_oauth2_fullstack",
+     FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION |
+         FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION |
+         FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS,
+     chttp2_create_fixture_secure_fullstack,
+     chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack,
+     chttp2_init_server_simple_ssl_secure_fullstack,
+     chttp2_tear_down_secure_fullstack},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
-  grpc_test_init (argc, argv);
+  grpc_test_init(argc, argv);
 
-  grpc_init ();
+  grpc_init();
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_proxy.c b/test/core/end2end/fixtures/h2_proxy.c
index 479db966ca..44083e2676 100644
--- a/test/core/end2end/fixtures/h2_proxy.c
+++ b/test/core/end2end/fixtures/h2_proxy.c
@@ -51,95 +51,82 @@
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
-typedef struct fullstack_fixture_data
-{
+typedef struct fullstack_fixture_data {
   grpc_end2end_proxy *proxy;
 } fullstack_fixture_data;
 
-static grpc_server *
-create_proxy_server (const char *port)
-{
-  grpc_server *s = grpc_server_create (NULL, NULL);
-  GPR_ASSERT (grpc_server_add_insecure_http2_port (s, port));
+static grpc_server *create_proxy_server(const char *port) {
+  grpc_server *s = grpc_server_create(NULL, NULL);
+  GPR_ASSERT(grpc_server_add_insecure_http2_port(s, port));
   return s;
 }
 
-static grpc_channel *
-create_proxy_client (const char *target)
-{
-  return grpc_insecure_channel_create (target, NULL, NULL);
+static grpc_channel *create_proxy_client(const char *target) {
+  return grpc_insecure_channel_create(target, NULL, NULL);
 }
 
-static const grpc_end2end_proxy_def proxy_def = { create_proxy_server,
-  create_proxy_client
-};
+static const grpc_end2end_proxy_def proxy_def = {create_proxy_server,
+                                                 create_proxy_client};
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data));
-  memset (&f, 0, sizeof (f));
+  fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data));
+  memset(&f, 0, sizeof(f));
 
-  ffd->proxy = grpc_end2end_proxy_create (&proxy_def);
+  ffd->proxy = grpc_end2end_proxy_create(&proxy_def);
 
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-void
-chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
+void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f,
+                                  grpc_channel_args *client_args) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  f->client = grpc_insecure_channel_create (grpc_end2end_proxy_get_client_target (ffd->proxy), client_args, NULL);
-  GPR_ASSERT (f->client);
+  f->client = grpc_insecure_channel_create(
+      grpc_end2end_proxy_get_client_target(ffd->proxy), client_args, NULL);
+  GPR_ASSERT(f->client);
 }
 
-void
-chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
+void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f,
+                                  grpc_channel_args *server_args) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (server_args, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_insecure_http2_port (f->server, grpc_end2end_proxy_get_server_port (ffd->proxy)));
-  grpc_server_start (f->server);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(server_args, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_insecure_http2_port(
+      f->server, grpc_end2end_proxy_get_server_port(ffd->proxy)));
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  grpc_end2end_proxy_destroy (ffd->proxy);
-  gpr_free (ffd);
+  grpc_end2end_proxy_destroy(ffd->proxy);
+  gpr_free(ffd);
 }
 
 /* All test configurations */
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/fullstack+proxy", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
-   chttp2_create_fixture_fullstack, chttp2_init_client_fullstack,
-   chttp2_init_server_fullstack, chttp2_tear_down_fullstack},
+    {"chttp2/fullstack+proxy", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
+     chttp2_create_fixture_fullstack, chttp2_init_client_fullstack,
+     chttp2_init_server_fullstack, chttp2_tear_down_fullstack},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
 
-  grpc_test_init (argc, argv);
-  grpc_init ();
+  grpc_test_init(argc, argv);
+  grpc_init();
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c
index 2ba0c0793f..1f5051f0ab 100644
--- a/test/core/end2end/fixtures/h2_sockpair+trace.c
+++ b/test/core/end2end/fixtures/h2_sockpair+trace.c
@@ -57,133 +57,127 @@
 /* chttp2 transport that is immediately available (used for testing
    connected_channel without a client_channel */
 
-static void
-server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx)
-{
+static void server_setup_transport(void *ts, grpc_transport *transport,
+                                   grpc_mdctx *mdctx) {
   grpc_end2end_test_fixture *f = ts;
   static grpc_channel_filter const *extra_filters[] = {
-    &grpc_http_server_filter
-  };
+      &grpc_http_server_filter};
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
-  grpc_server_setup_transport (&exec_ctx, f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server));
-  grpc_exec_ctx_finish (&exec_ctx);
+  grpc_server_setup_transport(&exec_ctx, f->server, transport, extra_filters,
+                              GPR_ARRAY_SIZE(extra_filters), mdctx,
+                              grpc_server_get_channel_args(f->server));
+  grpc_exec_ctx_finish(&exec_ctx);
 }
 
-typedef struct
-{
+typedef struct {
   grpc_end2end_test_fixture *f;
   grpc_channel_args *client_args;
 } sp_client_setup;
 
-static void
-client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx)
-{
+static void client_setup_transport(grpc_exec_ctx *exec_ctx, void *ts,
+                                   grpc_transport *transport,
+                                   grpc_mdctx *mdctx) {
   sp_client_setup *cs = ts;
 
-  const grpc_channel_filter *filters[] = { &grpc_http_client_filter,
-    &grpc_compress_filter,
-    &grpc_connected_channel_filter
-  };
-  size_t nfilters = sizeof (filters) / sizeof (*filters);
-  grpc_channel *channel = grpc_channel_create_from_filters (exec_ctx, "socketpair-target", filters, nfilters,
-							    cs->client_args, mdctx, 1);
+  const grpc_channel_filter *filters[] = {&grpc_http_client_filter,
+                                          &grpc_compress_filter,
+                                          &grpc_connected_channel_filter};
+  size_t nfilters = sizeof(filters) / sizeof(*filters);
+  grpc_channel *channel =
+      grpc_channel_create_from_filters(exec_ctx, "socketpair-target", filters,
+                                       nfilters, cs->client_args, mdctx, 1);
 
   cs->f->client = channel;
 
-  grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport);
+  grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel),
+                                        transport);
 }
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
-  grpc_endpoint_pair *sfd = gpr_malloc (sizeof (grpc_endpoint_pair));
+static grpc_end2end_test_fixture chttp2_create_fixture_socketpair(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
+  grpc_endpoint_pair *sfd = gpr_malloc(sizeof(grpc_endpoint_pair));
 
   grpc_end2end_test_fixture f;
-  memset (&f, 0, sizeof (f));
+  memset(&f, 0, sizeof(f));
   f.fixture_data = sfd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
-  *sfd = grpc_iomgr_create_endpoint_pair ("fixture", 65536);
+  *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536);
 
   return f;
 }
 
-static void
-chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
+static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f,
+                                          grpc_channel_args *client_args) {
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   grpc_endpoint_pair *sfd = f->fixture_data;
   grpc_transport *transport;
-  grpc_mdctx *mdctx = grpc_mdctx_create ();
+  grpc_mdctx *mdctx = grpc_mdctx_create();
   sp_client_setup cs;
   cs.client_args = client_args;
   cs.f = f;
-  transport = grpc_create_chttp2_transport (&exec_ctx, client_args, sfd->client, mdctx, 1);
-  client_setup_transport (&exec_ctx, &cs, transport, mdctx);
-  GPR_ASSERT (f->client);
-  grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0);
-  grpc_exec_ctx_finish (&exec_ctx);
+  transport = grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client,
+                                           mdctx, 1);
+  client_setup_transport(&exec_ctx, &cs, transport, mdctx);
+  GPR_ASSERT(f->client);
+  grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0);
+  grpc_exec_ctx_finish(&exec_ctx);
 }
 
-static void
-chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
+static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f,
+                                          grpc_channel_args *server_args) {
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   grpc_endpoint_pair *sfd = f->fixture_data;
-  grpc_mdctx *mdctx = grpc_mdctx_create ();
+  grpc_mdctx *mdctx = grpc_mdctx_create();
   grpc_transport *transport;
-  GPR_ASSERT (!f->server);
-  f->server = grpc_server_create_from_filters (NULL, 0, server_args);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  grpc_server_start (f->server);
-  transport = grpc_create_chttp2_transport (&exec_ctx, server_args, sfd->server, mdctx, 0);
-  server_setup_transport (f, transport, mdctx);
-  grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0);
-  grpc_exec_ctx_finish (&exec_ctx);
+  GPR_ASSERT(!f->server);
+  f->server = grpc_server_create_from_filters(NULL, 0, server_args);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  grpc_server_start(f->server);
+  transport = grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server,
+                                           mdctx, 0);
+  server_setup_transport(f, transport, mdctx);
+  grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0);
+  grpc_exec_ctx_finish(&exec_ctx);
 }
 
-static void
-chttp2_tear_down_socketpair (grpc_end2end_test_fixture * f)
-{
-  gpr_free (f->fixture_data);
+static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) {
+  gpr_free(f->fixture_data);
 }
 
 /* All test configurations */
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair,
-   chttp2_init_client_socketpair, chttp2_init_server_socketpair,
-   chttp2_tear_down_socketpair},
+    {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair,
+     chttp2_init_client_socketpair, chttp2_init_server_socketpair,
+     chttp2_tear_down_socketpair},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
 
   /* force tracing on, with a value to force many
      code paths in trace.c to be taken */
-  gpr_setenv ("GRPC_TRACE", "doesnt-exist,http,all");
+  gpr_setenv("GRPC_TRACE", "doesnt-exist,http,all");
 #ifdef GPR_POSIX_SOCKET
-  g_fixture_slowdown_factor = isatty (STDOUT_FILENO) ? 10.0 : 1.0;
+  g_fixture_slowdown_factor = isatty(STDOUT_FILENO) ? 10.0 : 1.0;
 #else
   g_fixture_slowdown_factor = 10.0;
 #endif
 
-  grpc_test_init (argc, argv);
-  grpc_init ();
-  grpc_exec_ctx_finish (&exec_ctx);
+  grpc_test_init(argc, argv);
+  grpc_init();
+  grpc_exec_ctx_finish(&exec_ctx);
 
-  GPR_ASSERT (0 == grpc_tracer_set_enabled ("also-doesnt-exist", 0));
-  GPR_ASSERT (1 == grpc_tracer_set_enabled ("http", 1));
-  GPR_ASSERT (1 == grpc_tracer_set_enabled ("all", 1));
+  GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0));
+  GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1));
+  GPR_ASSERT(1 == grpc_tracer_set_enabled("all", 1));
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c
index c0296a1b09..b61fe98610 100644
--- a/test/core/end2end/fixtures/h2_sockpair.c
+++ b/test/core/end2end/fixtures/h2_sockpair.c
@@ -56,118 +56,112 @@
 /* chttp2 transport that is immediately available (used for testing
    connected_channel without a client_channel */
 
-static void
-server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx)
-{
+static void server_setup_transport(void *ts, grpc_transport *transport,
+                                   grpc_mdctx *mdctx) {
   grpc_end2end_test_fixture *f = ts;
   static grpc_channel_filter const *extra_filters[] = {
-    &grpc_http_server_filter
-  };
+      &grpc_http_server_filter};
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
-  grpc_server_setup_transport (&exec_ctx, f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server));
-  grpc_exec_ctx_finish (&exec_ctx);
+  grpc_server_setup_transport(&exec_ctx, f->server, transport, extra_filters,
+                              GPR_ARRAY_SIZE(extra_filters), mdctx,
+                              grpc_server_get_channel_args(f->server));
+  grpc_exec_ctx_finish(&exec_ctx);
 }
 
-typedef struct
-{
+typedef struct {
   grpc_end2end_test_fixture *f;
   grpc_channel_args *client_args;
 } sp_client_setup;
 
-static void
-client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx)
-{
+static void client_setup_transport(grpc_exec_ctx *exec_ctx, void *ts,
+                                   grpc_transport *transport,
+                                   grpc_mdctx *mdctx) {
   sp_client_setup *cs = ts;
 
-  const grpc_channel_filter *filters[] = { &grpc_http_client_filter,
-    &grpc_compress_filter,
-    &grpc_connected_channel_filter
-  };
-  size_t nfilters = sizeof (filters) / sizeof (*filters);
-  grpc_channel *channel = grpc_channel_create_from_filters (exec_ctx,"socketpair-target", filters, nfilters,
-							    cs->client_args, mdctx, 1);
+  const grpc_channel_filter *filters[] = {&grpc_http_client_filter,
+                                          &grpc_compress_filter,
+                                          &grpc_connected_channel_filter};
+  size_t nfilters = sizeof(filters) / sizeof(*filters);
+  grpc_channel *channel =
+      grpc_channel_create_from_filters(exec_ctx, "socketpair-target", filters,
+                                       nfilters, cs->client_args, mdctx, 1);
 
   cs->f->client = channel;
 
-  grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport);
+  grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel),
+                                        transport);
 }
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
-  grpc_endpoint_pair *sfd = gpr_malloc (sizeof (grpc_endpoint_pair));
+static grpc_end2end_test_fixture chttp2_create_fixture_socketpair(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
+  grpc_endpoint_pair *sfd = gpr_malloc(sizeof(grpc_endpoint_pair));
 
   grpc_end2end_test_fixture f;
-  memset (&f, 0, sizeof (f));
+  memset(&f, 0, sizeof(f));
   f.fixture_data = sfd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
-  *sfd = grpc_iomgr_create_endpoint_pair ("fixture", 65536);
+  *sfd = grpc_iomgr_create_endpoint_pair("fixture", 65536);
 
   return f;
 }
 
-static void
-chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
+static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f,
+                                          grpc_channel_args *client_args) {
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   grpc_endpoint_pair *sfd = f->fixture_data;
   grpc_transport *transport;
-  grpc_mdctx *mdctx = grpc_mdctx_create ();
+  grpc_mdctx *mdctx = grpc_mdctx_create();
   sp_client_setup cs;
   cs.client_args = client_args;
   cs.f = f;
-  transport = grpc_create_chttp2_transport (&exec_ctx, client_args, sfd->client, mdctx, 1);
-  client_setup_transport (&exec_ctx, &cs, transport, mdctx);
-  GPR_ASSERT (f->client);
-  grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0);
-  grpc_exec_ctx_finish (&exec_ctx);
+  transport = grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client,
+                                           mdctx, 1);
+  client_setup_transport(&exec_ctx, &cs, transport, mdctx);
+  GPR_ASSERT(f->client);
+  grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0);
+  grpc_exec_ctx_finish(&exec_ctx);
 }
 
-static void
-chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
+static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f,
+                                          grpc_channel_args *server_args) {
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   grpc_endpoint_pair *sfd = f->fixture_data;
-  grpc_mdctx *mdctx = grpc_mdctx_create ();
+  grpc_mdctx *mdctx = grpc_mdctx_create();
   grpc_transport *transport;
-  GPR_ASSERT (!f->server);
-  f->server = grpc_server_create_from_filters (NULL, 0, server_args);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  grpc_server_start (f->server);
-  transport = grpc_create_chttp2_transport (&exec_ctx, server_args, sfd->server, mdctx, 0);
-  server_setup_transport (f, transport, mdctx);
-  grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0);
-  grpc_exec_ctx_finish (&exec_ctx);
+  GPR_ASSERT(!f->server);
+  f->server = grpc_server_create_from_filters(NULL, 0, server_args);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  grpc_server_start(f->server);
+  transport = grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server,
+                                           mdctx, 0);
+  server_setup_transport(f, transport, mdctx);
+  grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0);
+  grpc_exec_ctx_finish(&exec_ctx);
 }
 
-static void
-chttp2_tear_down_socketpair (grpc_end2end_test_fixture * f)
-{
-  gpr_free (f->fixture_data);
+static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) {
+  gpr_free(f->fixture_data);
 }
 
 /* All test configurations */
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair,
-   chttp2_init_client_socketpair, chttp2_init_server_socketpair,
-   chttp2_tear_down_socketpair},
+    {"chttp2/socketpair", 0, chttp2_create_fixture_socketpair,
+     chttp2_init_client_socketpair, chttp2_init_server_socketpair,
+     chttp2_tear_down_socketpair},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
 
-  grpc_test_init (argc, argv);
-  grpc_init ();
+  grpc_test_init(argc, argv);
+  grpc_init();
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c
index 1f39499d09..9f0fd2ea9a 100644
--- a/test/core/end2end/fixtures/h2_sockpair_1byte.c
+++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c
@@ -56,118 +56,112 @@
 /* chttp2 transport that is immediately available (used for testing
    connected_channel without a client_channel */
 
-static void
-server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx)
-{
+static void server_setup_transport(void *ts, grpc_transport *transport,
+                                   grpc_mdctx *mdctx) {
   grpc_end2end_test_fixture *f = ts;
   static grpc_channel_filter const *extra_filters[] = {
-    &grpc_http_server_filter
-  };
+      &grpc_http_server_filter};
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
-  grpc_server_setup_transport (&exec_ctx, f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server));
-  grpc_exec_ctx_finish (&exec_ctx);
+  grpc_server_setup_transport(&exec_ctx, f->server, transport, extra_filters,
+                              GPR_ARRAY_SIZE(extra_filters), mdctx,
+                              grpc_server_get_channel_args(f->server));
+  grpc_exec_ctx_finish(&exec_ctx);
 }
 
-typedef struct
-{
+typedef struct {
   grpc_end2end_test_fixture *f;
   grpc_channel_args *client_args;
 } sp_client_setup;
 
-static void
-client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx)
-{
+static void client_setup_transport(grpc_exec_ctx *exec_ctx, void *ts,
+                                   grpc_transport *transport,
+                                   grpc_mdctx *mdctx) {
   sp_client_setup *cs = ts;
 
-  const grpc_channel_filter *filters[] = { &grpc_http_client_filter,
-    &grpc_compress_filter,
-    &grpc_connected_channel_filter
-  };
-  size_t nfilters = sizeof (filters) / sizeof (*filters);
-  grpc_channel *channel = grpc_channel_create_from_filters (exec_ctx, "socketpair-target", filters, nfilters,
-							    cs->client_args, mdctx, 1);
+  const grpc_channel_filter *filters[] = {&grpc_http_client_filter,
+                                          &grpc_compress_filter,
+                                          &grpc_connected_channel_filter};
+  size_t nfilters = sizeof(filters) / sizeof(*filters);
+  grpc_channel *channel =
+      grpc_channel_create_from_filters(exec_ctx, "socketpair-target", filters,
+                                       nfilters, cs->client_args, mdctx, 1);
 
   cs->f->client = channel;
 
-  grpc_connected_channel_bind_transport (grpc_channel_get_channel_stack (channel), transport);
+  grpc_connected_channel_bind_transport(grpc_channel_get_channel_stack(channel),
+                                        transport);
 }
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_socketpair (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
-  grpc_endpoint_pair *sfd = gpr_malloc (sizeof (grpc_endpoint_pair));
+static grpc_end2end_test_fixture chttp2_create_fixture_socketpair(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
+  grpc_endpoint_pair *sfd = gpr_malloc(sizeof(grpc_endpoint_pair));
 
   grpc_end2end_test_fixture f;
-  memset (&f, 0, sizeof (f));
+  memset(&f, 0, sizeof(f));
   f.fixture_data = sfd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
-  *sfd = grpc_iomgr_create_endpoint_pair ("fixture", 1);
+  *sfd = grpc_iomgr_create_endpoint_pair("fixture", 1);
 
   return f;
 }
 
-static void
-chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
+static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f,
+                                          grpc_channel_args *client_args) {
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   grpc_endpoint_pair *sfd = f->fixture_data;
   grpc_transport *transport;
-  grpc_mdctx *mdctx = grpc_mdctx_create ();
+  grpc_mdctx *mdctx = grpc_mdctx_create();
   sp_client_setup cs;
   cs.client_args = client_args;
   cs.f = f;
-  transport = grpc_create_chttp2_transport (&exec_ctx, client_args, sfd->client, mdctx, 1);
-  client_setup_transport (&exec_ctx, &cs, transport, mdctx);
-  GPR_ASSERT (f->client);
-  grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0);
-  grpc_exec_ctx_finish (&exec_ctx);
+  transport = grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client,
+                                           mdctx, 1);
+  client_setup_transport(&exec_ctx, &cs, transport, mdctx);
+  GPR_ASSERT(f->client);
+  grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0);
+  grpc_exec_ctx_finish(&exec_ctx);
 }
 
-static void
-chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
+static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f,
+                                          grpc_channel_args *server_args) {
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   grpc_endpoint_pair *sfd = f->fixture_data;
-  grpc_mdctx *mdctx = grpc_mdctx_create ();
+  grpc_mdctx *mdctx = grpc_mdctx_create();
   grpc_transport *transport;
-  GPR_ASSERT (!f->server);
-  f->server = grpc_server_create_from_filters (NULL, 0, server_args);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  grpc_server_start (f->server);
-  transport = grpc_create_chttp2_transport (&exec_ctx, server_args, sfd->server, mdctx, 0);
-  server_setup_transport (f, transport, mdctx);
-  grpc_chttp2_transport_start_reading (&exec_ctx, transport, NULL, 0);
-  grpc_exec_ctx_finish (&exec_ctx);
+  GPR_ASSERT(!f->server);
+  f->server = grpc_server_create_from_filters(NULL, 0, server_args);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  grpc_server_start(f->server);
+  transport = grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server,
+                                           mdctx, 0);
+  server_setup_transport(f, transport, mdctx);
+  grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL, 0);
+  grpc_exec_ctx_finish(&exec_ctx);
 }
 
-static void
-chttp2_tear_down_socketpair (grpc_end2end_test_fixture * f)
-{
-  gpr_free (f->fixture_data);
+static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) {
+  gpr_free(f->fixture_data);
 }
 
 /* All test configurations */
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/socketpair_one_byte_at_a_time", 0,
-   chttp2_create_fixture_socketpair, chttp2_init_client_socketpair,
-   chttp2_init_server_socketpair, chttp2_tear_down_socketpair},
+    {"chttp2/socketpair_one_byte_at_a_time", 0,
+     chttp2_create_fixture_socketpair, chttp2_init_client_socketpair,
+     chttp2_init_server_socketpair, chttp2_tear_down_socketpair},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
 
-  grpc_test_init (argc, argv);
-  grpc_init ();
+  grpc_test_init(argc, argv);
+  grpc_init();
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_ssl+poll.c b/test/core/end2end/fixtures/h2_ssl+poll.c
index 55c12a37ca..2c605d1471 100644
--- a/test/core/end2end/fixtures/h2_ssl+poll.c
+++ b/test/core/end2end/fixtures/h2_ssl+poll.c
@@ -48,153 +48,145 @@
 #include "test/core/util/port.h"
 #include "test/core/end2end/data/ssl_test_data.h"
 
-typedef struct fullstack_secure_fixture_data
-{
+typedef struct fullstack_secure_fixture_data {
   char *localaddr;
 } fullstack_secure_fixture_data;
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  int port = grpc_pick_unused_port_or_die ();
-  fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data));
-  memset (&f, 0, sizeof (f));
+  int port = grpc_pick_unused_port_or_die();
+  fullstack_secure_fixture_data *ffd =
+      gpr_malloc(sizeof(fullstack_secure_fixture_data));
+  memset(&f, 0, sizeof(f));
 
-  gpr_join_host_port (&ffd->localaddr, "localhost", port);
+  gpr_join_host_port(&ffd->localaddr, "localhost", port);
 
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-static void
-process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data)
-{
-  GPR_ASSERT (state == NULL);
-  cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL);
+static void process_auth_failure(void *state, grpc_auth_context *ctx,
+                                 const grpc_metadata *md, size_t md_count,
+                                 grpc_process_auth_metadata_done_cb cb,
+                                 void *user_data) {
+  GPR_ASSERT(state == NULL);
+  cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL);
 }
 
-static void
-chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds)
-{
+static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f,
+                                                grpc_channel_args *client_args,
+                                                grpc_credentials *creds) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL);
-  GPR_ASSERT (f->client != NULL);
-  grpc_credentials_release (creds);
+  f->client =
+      grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL);
+  GPR_ASSERT(f->client != NULL);
+  grpc_credentials_release(creds);
 }
 
-static void
-chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds)
-{
+static void chttp2_init_server_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *server_args,
+    grpc_server_credentials *server_creds) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (server_args, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds));
-  grpc_server_credentials_release (server_creds);
-  grpc_server_start (f->server);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(server_args, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr,
+                                               server_creds));
+  grpc_server_credentials_release(server_creds);
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  gpr_free (ffd->localaddr);
-  gpr_free (ffd);
+  gpr_free(ffd->localaddr);
+  gpr_free(ffd);
 }
 
-static void
-chttp2_init_client_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
-  grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL);
-  grpc_arg ssl_name_override = { GRPC_ARG_STRING,
-    GRPC_SSL_TARGET_NAME_OVERRIDE_ARG,
-    {"foo.test.google.fr"}
-  };
-  grpc_channel_args *new_client_args = grpc_channel_args_copy_and_add (client_args, &ssl_name_override, 1);
-  chttp2_init_client_secure_fullstack (f, new_client_args, ssl_creds);
-  grpc_channel_args_destroy (new_client_args);
+static void chttp2_init_client_simple_ssl_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *client_args) {
+  grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL);
+  grpc_arg ssl_name_override = {GRPC_ARG_STRING,
+                                GRPC_SSL_TARGET_NAME_OVERRIDE_ARG,
+                                {"foo.test.google.fr"}};
+  grpc_channel_args *new_client_args =
+      grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1);
+  chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds);
+  grpc_channel_args_destroy(new_client_args);
 }
 
-static int
-fail_server_auth_check (grpc_channel_args * server_args)
-{
+static int fail_server_auth_check(grpc_channel_args *server_args) {
   size_t i;
-  if (server_args == NULL)
-    return 0;
-  for (i = 0; i < server_args->num_args; i++)
-    {
-      if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0)
-	{
-	  return 1;
-	}
+  if (server_args == NULL) return 0;
+  for (i = 0; i < server_args->num_args; i++) {
+    if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) ==
+        0) {
+      return 1;
     }
+  }
   return 0;
 }
 
-static void
-chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
-  grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key,
-    test_server1_cert
-  };
-  grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL);
-  if (fail_server_auth_check (server_args))
-    {
-      grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL };
-      grpc_server_credentials_set_auth_metadata_processor (ssl_creds, processor);
-    }
-  chttp2_init_server_secure_fullstack (f, server_args, ssl_creds);
+static void chttp2_init_server_simple_ssl_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *server_args) {
+  grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key,
+                                                  test_server1_cert};
+  grpc_server_credentials *ssl_creds =
+      grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL);
+  if (fail_server_auth_check(server_args)) {
+    grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL};
+    grpc_server_credentials_set_auth_metadata_processor(ssl_creds, processor);
+  }
+  chttp2_init_server_secure_fullstack(f, server_args, ssl_creds);
 }
 
 /* All test configurations */
 
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/simple_ssl_fullstack",
-   FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS,
-   chttp2_create_fixture_secure_fullstack,
-   chttp2_init_client_simple_ssl_secure_fullstack,
-   chttp2_init_server_simple_ssl_secure_fullstack,
-   chttp2_tear_down_secure_fullstack},
+    {"chttp2/simple_ssl_fullstack",
+     FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION |
+         FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION |
+         FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS,
+     chttp2_create_fixture_secure_fullstack,
+     chttp2_init_client_simple_ssl_secure_fullstack,
+     chttp2_init_server_simple_ssl_secure_fullstack,
+     chttp2_tear_down_secure_fullstack},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
   FILE *roots_file;
-  size_t roots_size = strlen (test_root_cert);
+  size_t roots_size = strlen(test_root_cert);
   char *roots_filename;
 
   grpc_platform_become_multipoller = grpc_poll_become_multipoller;
 
-  grpc_test_init (argc, argv);
+  grpc_test_init(argc, argv);
 
   /* Set the SSL roots env var. */
-  roots_file = gpr_tmpfile ("chttp2_simple_ssl_with_poll_fullstack_test", &roots_filename);
-  GPR_ASSERT (roots_filename != NULL);
-  GPR_ASSERT (roots_file != NULL);
-  GPR_ASSERT (fwrite (test_root_cert, 1, roots_size, roots_file) == roots_size);
-  fclose (roots_file);
-  gpr_setenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename);
-
-  grpc_init ();
-
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  roots_file = gpr_tmpfile("chttp2_simple_ssl_with_poll_fullstack_test",
+                           &roots_filename);
+  GPR_ASSERT(roots_filename != NULL);
+  GPR_ASSERT(roots_file != NULL);
+  GPR_ASSERT(fwrite(test_root_cert, 1, roots_size, roots_file) == roots_size);
+  fclose(roots_file);
+  gpr_setenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename);
+
+  grpc_init();
+
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   /* Cleanup. */
-  remove (roots_filename);
-  gpr_free (roots_filename);
+  remove(roots_filename);
+  gpr_free(roots_filename);
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_ssl.c b/test/core/end2end/fixtures/h2_ssl.c
index 7752ff2703..9193a09b17 100644
--- a/test/core/end2end/fixtures/h2_ssl.c
+++ b/test/core/end2end/fixtures/h2_ssl.c
@@ -48,151 +48,142 @@
 #include "test/core/util/port.h"
 #include "test/core/end2end/data/ssl_test_data.h"
 
-typedef struct fullstack_secure_fixture_data
-{
+typedef struct fullstack_secure_fixture_data {
   char *localaddr;
 } fullstack_secure_fixture_data;
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  int port = grpc_pick_unused_port_or_die ();
-  fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data));
-  memset (&f, 0, sizeof (f));
+  int port = grpc_pick_unused_port_or_die();
+  fullstack_secure_fixture_data *ffd =
+      gpr_malloc(sizeof(fullstack_secure_fixture_data));
+  memset(&f, 0, sizeof(f));
 
-  gpr_join_host_port (&ffd->localaddr, "localhost", port);
+  gpr_join_host_port(&ffd->localaddr, "localhost", port);
 
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-static void
-process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data)
-{
-  GPR_ASSERT (state == NULL);
-  cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL);
+static void process_auth_failure(void *state, grpc_auth_context *ctx,
+                                 const grpc_metadata *md, size_t md_count,
+                                 grpc_process_auth_metadata_done_cb cb,
+                                 void *user_data) {
+  GPR_ASSERT(state == NULL);
+  cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL);
 }
 
-static void
-chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds)
-{
+static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f,
+                                                grpc_channel_args *client_args,
+                                                grpc_credentials *creds) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  f->client = grpc_secure_channel_create (creds, ffd->localaddr, client_args, NULL);
-  GPR_ASSERT (f->client != NULL);
-  grpc_credentials_release (creds);
+  f->client =
+      grpc_secure_channel_create(creds, ffd->localaddr, client_args, NULL);
+  GPR_ASSERT(f->client != NULL);
+  grpc_credentials_release(creds);
 }
 
-static void
-chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds)
-{
+static void chttp2_init_server_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *server_args,
+    grpc_server_credentials *server_creds) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (server_args, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, ffd->localaddr, server_creds));
-  grpc_server_credentials_release (server_creds);
-  grpc_server_start (f->server);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(server_args, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr,
+                                               server_creds));
+  grpc_server_credentials_release(server_creds);
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  gpr_free (ffd->localaddr);
-  gpr_free (ffd);
+  gpr_free(ffd->localaddr);
+  gpr_free(ffd);
 }
 
-static void
-chttp2_init_client_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
-  grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL);
-  grpc_arg ssl_name_override = { GRPC_ARG_STRING,
-    GRPC_SSL_TARGET_NAME_OVERRIDE_ARG,
-    {"foo.test.google.fr"}
-  };
-  grpc_channel_args *new_client_args = grpc_channel_args_copy_and_add (client_args, &ssl_name_override, 1);
-  chttp2_init_client_secure_fullstack (f, new_client_args, ssl_creds);
-  grpc_channel_args_destroy (new_client_args);
+static void chttp2_init_client_simple_ssl_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *client_args) {
+  grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL);
+  grpc_arg ssl_name_override = {GRPC_ARG_STRING,
+                                GRPC_SSL_TARGET_NAME_OVERRIDE_ARG,
+                                {"foo.test.google.fr"}};
+  grpc_channel_args *new_client_args =
+      grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1);
+  chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds);
+  grpc_channel_args_destroy(new_client_args);
 }
 
-static int
-fail_server_auth_check (grpc_channel_args * server_args)
-{
+static int fail_server_auth_check(grpc_channel_args *server_args) {
   size_t i;
-  if (server_args == NULL)
-    return 0;
-  for (i = 0; i < server_args->num_args; i++)
-    {
-      if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0)
-	{
-	  return 1;
-	}
+  if (server_args == NULL) return 0;
+  for (i = 0; i < server_args->num_args; i++) {
+    if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) ==
+        0) {
+      return 1;
     }
+  }
   return 0;
 }
 
-static void
-chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
-  grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key,
-    test_server1_cert
-  };
-  grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL);
-  if (fail_server_auth_check (server_args))
-    {
-      grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL };
-      grpc_server_credentials_set_auth_metadata_processor (ssl_creds, processor);
-    }
-  chttp2_init_server_secure_fullstack (f, server_args, ssl_creds);
+static void chttp2_init_server_simple_ssl_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *server_args) {
+  grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key,
+                                                  test_server1_cert};
+  grpc_server_credentials *ssl_creds =
+      grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL);
+  if (fail_server_auth_check(server_args)) {
+    grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL};
+    grpc_server_credentials_set_auth_metadata_processor(ssl_creds, processor);
+  }
+  chttp2_init_server_secure_fullstack(f, server_args, ssl_creds);
 }
 
 /* All test configurations */
 
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/simple_ssl_fullstack",
-   FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS,
-   chttp2_create_fixture_secure_fullstack,
-   chttp2_init_client_simple_ssl_secure_fullstack,
-   chttp2_init_server_simple_ssl_secure_fullstack,
-   chttp2_tear_down_secure_fullstack},
+    {"chttp2/simple_ssl_fullstack",
+     FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION |
+         FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION |
+         FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS,
+     chttp2_create_fixture_secure_fullstack,
+     chttp2_init_client_simple_ssl_secure_fullstack,
+     chttp2_init_server_simple_ssl_secure_fullstack,
+     chttp2_tear_down_secure_fullstack},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
   FILE *roots_file;
-  size_t roots_size = strlen (test_root_cert);
+  size_t roots_size = strlen(test_root_cert);
   char *roots_filename;
 
-  grpc_test_init (argc, argv);
+  grpc_test_init(argc, argv);
 
   /* Set the SSL roots env var. */
-  roots_file = gpr_tmpfile ("chttp2_simple_ssl_fullstack_test", &roots_filename);
-  GPR_ASSERT (roots_filename != NULL);
-  GPR_ASSERT (roots_file != NULL);
-  GPR_ASSERT (fwrite (test_root_cert, 1, roots_size, roots_file) == roots_size);
-  fclose (roots_file);
-  gpr_setenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename);
-
-  grpc_init ();
-
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  roots_file = gpr_tmpfile("chttp2_simple_ssl_fullstack_test", &roots_filename);
+  GPR_ASSERT(roots_filename != NULL);
+  GPR_ASSERT(roots_file != NULL);
+  GPR_ASSERT(fwrite(test_root_cert, 1, roots_size, roots_file) == roots_size);
+  fclose(roots_file);
+  gpr_setenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename);
+
+  grpc_init();
+
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   /* Cleanup. */
-  remove (roots_filename);
-  gpr_free (roots_filename);
+  remove(roots_filename);
+  gpr_free(roots_filename);
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.c b/test/core/end2end/fixtures/h2_ssl_proxy.c
index ff82a0f291..8133a69a0c 100644
--- a/test/core/end2end/fixtures/h2_ssl_proxy.c
+++ b/test/core/end2end/fixtures/h2_ssl_proxy.c
@@ -49,184 +49,170 @@
 #include "test/core/util/test_config.h"
 #include "test/core/util/port.h"
 
-typedef struct fullstack_secure_fixture_data
-{
+typedef struct fullstack_secure_fixture_data {
   grpc_end2end_proxy *proxy;
 } fullstack_secure_fixture_data;
 
-static grpc_server *
-create_proxy_server (const char *port)
-{
-  grpc_server *s = grpc_server_create (NULL, NULL);
-  grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key,
-    test_server1_cert
-  };
-  grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL);
-  GPR_ASSERT (grpc_server_add_secure_http2_port (s, port, ssl_creds));
-  grpc_server_credentials_release (ssl_creds);
+static grpc_server *create_proxy_server(const char *port) {
+  grpc_server *s = grpc_server_create(NULL, NULL);
+  grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key,
+                                                  test_server1_cert};
+  grpc_server_credentials *ssl_creds =
+      grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL);
+  GPR_ASSERT(grpc_server_add_secure_http2_port(s, port, ssl_creds));
+  grpc_server_credentials_release(ssl_creds);
   return s;
 }
 
-static grpc_channel *
-create_proxy_client (const char *target)
-{
+static grpc_channel *create_proxy_client(const char *target) {
   grpc_channel *channel;
-  grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL);
-  grpc_arg ssl_name_override = { GRPC_ARG_STRING,
-    GRPC_SSL_TARGET_NAME_OVERRIDE_ARG,
-    {"foo.test.google.fr"}
-  };
+  grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL);
+  grpc_arg ssl_name_override = {GRPC_ARG_STRING,
+                                GRPC_SSL_TARGET_NAME_OVERRIDE_ARG,
+                                {"foo.test.google.fr"}};
   grpc_channel_args client_args;
   client_args.num_args = 1;
   client_args.args = &ssl_name_override;
-  channel = grpc_secure_channel_create (ssl_creds, target, &client_args, NULL);
-  grpc_credentials_release (ssl_creds);
+  channel = grpc_secure_channel_create(ssl_creds, target, &client_args, NULL);
+  grpc_credentials_release(ssl_creds);
   return channel;
 }
 
-static const grpc_end2end_proxy_def proxy_def = { create_proxy_server,
-  create_proxy_client
-};
+static const grpc_end2end_proxy_def proxy_def = {create_proxy_server,
+                                                 create_proxy_client};
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_secure_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  fullstack_secure_fixture_data *ffd = gpr_malloc (sizeof (fullstack_secure_fixture_data));
-  memset (&f, 0, sizeof (f));
+  fullstack_secure_fixture_data *ffd =
+      gpr_malloc(sizeof(fullstack_secure_fixture_data));
+  memset(&f, 0, sizeof(f));
 
-  ffd->proxy = grpc_end2end_proxy_create (&proxy_def);
+  ffd->proxy = grpc_end2end_proxy_create(&proxy_def);
 
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-static void
-process_auth_failure (void *state, grpc_auth_context * ctx, const grpc_metadata * md, size_t md_count, grpc_process_auth_metadata_done_cb cb, void *user_data)
-{
-  GPR_ASSERT (state == NULL);
-  cb (user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL);
+static void process_auth_failure(void *state, grpc_auth_context *ctx,
+                                 const grpc_metadata *md, size_t md_count,
+                                 grpc_process_auth_metadata_done_cb cb,
+                                 void *user_data) {
+  GPR_ASSERT(state == NULL);
+  cb(user_data, NULL, 0, NULL, 0, GRPC_STATUS_UNAUTHENTICATED, NULL);
 }
 
-static void
-chttp2_init_client_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args, grpc_credentials * creds)
-{
+static void chttp2_init_client_secure_fullstack(grpc_end2end_test_fixture *f,
+                                                grpc_channel_args *client_args,
+                                                grpc_credentials *creds) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  f->client = grpc_secure_channel_create (creds, grpc_end2end_proxy_get_client_target (ffd->proxy), client_args, NULL);
-  GPR_ASSERT (f->client != NULL);
-  grpc_credentials_release (creds);
+  f->client = grpc_secure_channel_create(
+      creds, grpc_end2end_proxy_get_client_target(ffd->proxy), client_args,
+      NULL);
+  GPR_ASSERT(f->client != NULL);
+  grpc_credentials_release(creds);
 }
 
-static void
-chttp2_init_server_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args, grpc_server_credentials * server_creds)
-{
+static void chttp2_init_server_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *server_args,
+    grpc_server_credentials *server_creds) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (server_args, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_secure_http2_port (f->server, grpc_end2end_proxy_get_server_port (ffd->proxy), server_creds));
-  grpc_server_credentials_release (server_creds);
-  grpc_server_start (f->server);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(server_args, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_secure_http2_port(
+      f->server, grpc_end2end_proxy_get_server_port(ffd->proxy), server_creds));
+  grpc_server_credentials_release(server_creds);
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_secure_fullstack (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) {
   fullstack_secure_fixture_data *ffd = f->fixture_data;
-  grpc_end2end_proxy_destroy (ffd->proxy);
-  gpr_free (ffd);
+  grpc_end2end_proxy_destroy(ffd->proxy);
+  gpr_free(ffd);
 }
 
-static void
-chttp2_init_client_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
-  grpc_credentials *ssl_creds = grpc_ssl_credentials_create (NULL, NULL, NULL);
-  grpc_arg ssl_name_override = { GRPC_ARG_STRING,
-    GRPC_SSL_TARGET_NAME_OVERRIDE_ARG,
-    {"foo.test.google.fr"}
-  };
-  grpc_channel_args *new_client_args = grpc_channel_args_copy_and_add (client_args, &ssl_name_override, 1);
-  chttp2_init_client_secure_fullstack (f, new_client_args, ssl_creds);
-  grpc_channel_args_destroy (new_client_args);
+static void chttp2_init_client_simple_ssl_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *client_args) {
+  grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL);
+  grpc_arg ssl_name_override = {GRPC_ARG_STRING,
+                                GRPC_SSL_TARGET_NAME_OVERRIDE_ARG,
+                                {"foo.test.google.fr"}};
+  grpc_channel_args *new_client_args =
+      grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1);
+  chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds);
+  grpc_channel_args_destroy(new_client_args);
 }
 
-static int
-fail_server_auth_check (grpc_channel_args * server_args)
-{
+static int fail_server_auth_check(grpc_channel_args *server_args) {
   size_t i;
-  if (server_args == NULL)
-    return 0;
-  for (i = 0; i < server_args->num_args; i++)
-    {
-      if (strcmp (server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) == 0)
-	{
-	  return 1;
-	}
+  if (server_args == NULL) return 0;
+  for (i = 0; i < server_args->num_args; i++) {
+    if (strcmp(server_args->args[i].key, FAIL_AUTH_CHECK_SERVER_ARG_NAME) ==
+        0) {
+      return 1;
     }
+  }
   return 0;
 }
 
-static void
-chttp2_init_server_simple_ssl_secure_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
-  grpc_ssl_pem_key_cert_pair pem_cert_key_pair = { test_server1_key,
-    test_server1_cert
-  };
-  grpc_server_credentials *ssl_creds = grpc_ssl_server_credentials_create (NULL, &pem_cert_key_pair, 1, 0, NULL);
-  if (fail_server_auth_check (server_args))
-    {
-      grpc_auth_metadata_processor processor = { process_auth_failure, NULL, NULL };
-      grpc_server_credentials_set_auth_metadata_processor (ssl_creds, processor);
-    }
-  chttp2_init_server_secure_fullstack (f, server_args, ssl_creds);
+static void chttp2_init_server_simple_ssl_secure_fullstack(
+    grpc_end2end_test_fixture *f, grpc_channel_args *server_args) {
+  grpc_ssl_pem_key_cert_pair pem_cert_key_pair = {test_server1_key,
+                                                  test_server1_cert};
+  grpc_server_credentials *ssl_creds =
+      grpc_ssl_server_credentials_create(NULL, &pem_cert_key_pair, 1, 0, NULL);
+  if (fail_server_auth_check(server_args)) {
+    grpc_auth_metadata_processor processor = {process_auth_failure, NULL, NULL};
+    grpc_server_credentials_set_auth_metadata_processor(ssl_creds, processor);
+  }
+  chttp2_init_server_secure_fullstack(f, server_args, ssl_creds);
 }
 
 /* All test configurations */
 
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/simple_ssl_fullstack",
-   FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS,
-   chttp2_create_fixture_secure_fullstack,
-   chttp2_init_client_simple_ssl_secure_fullstack,
-   chttp2_init_server_simple_ssl_secure_fullstack,
-   chttp2_tear_down_secure_fullstack},
+    {"chttp2/simple_ssl_fullstack",
+     FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION |
+         FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION |
+         FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS,
+     chttp2_create_fixture_secure_fullstack,
+     chttp2_init_client_simple_ssl_secure_fullstack,
+     chttp2_init_server_simple_ssl_secure_fullstack,
+     chttp2_tear_down_secure_fullstack},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
   FILE *roots_file;
-  size_t roots_size = strlen (test_root_cert);
+  size_t roots_size = strlen(test_root_cert);
   char *roots_filename;
 
-  grpc_test_init (argc, argv);
+  grpc_test_init(argc, argv);
 
   /* Set the SSL roots env var. */
-  roots_file = gpr_tmpfile ("chttp2_simple_ssl_fullstack_test", &roots_filename);
-  GPR_ASSERT (roots_filename != NULL);
-  GPR_ASSERT (roots_file != NULL);
-  GPR_ASSERT (fwrite (test_root_cert, 1, roots_size, roots_file) == roots_size);
-  fclose (roots_file);
-  gpr_setenv (GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename);
-
-  grpc_init ();
-
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  roots_file = gpr_tmpfile("chttp2_simple_ssl_fullstack_test", &roots_filename);
+  GPR_ASSERT(roots_filename != NULL);
+  GPR_ASSERT(roots_file != NULL);
+  GPR_ASSERT(fwrite(test_root_cert, 1, roots_size, roots_file) == roots_size);
+  fclose(roots_file);
+  gpr_setenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, roots_filename);
+
+  grpc_init();
+
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   /* Cleanup. */
-  remove (roots_filename);
-  gpr_free (roots_filename);
+  remove(roots_filename);
+  gpr_free(roots_filename);
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_uds+poll.c b/test/core/end2end/fixtures/h2_uds+poll.c
index b2981fe0bc..05b9ea0949 100644
--- a/test/core/end2end/fixtures/h2_uds+poll.c
+++ b/test/core/end2end/fixtures/h2_uds+poll.c
@@ -54,80 +54,71 @@
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
-typedef struct fullstack_fixture_data
-{
+typedef struct fullstack_fixture_data {
   char *localaddr;
 } fullstack_fixture_data;
 
 static int unique = 1;
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data));
-  memset (&f, 0, sizeof (f));
+  fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data));
+  memset(&f, 0, sizeof(f));
 
-  gpr_asprintf (&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid (), unique++);
+  gpr_asprintf(&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid(),
+               unique++);
 
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-void
-chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
+void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f,
+                                  grpc_channel_args *client_args) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL);
+  f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL);
 }
 
-void
-chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
+void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f,
+                                  grpc_channel_args *server_args) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (server_args, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_insecure_http2_port (f->server, ffd->localaddr));
-  grpc_server_start (f->server);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(server_args, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr));
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  gpr_free (ffd->localaddr);
-  gpr_free (ffd);
+  gpr_free(ffd->localaddr);
+  gpr_free(ffd);
 }
 
 /* All test configurations */
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
-   chttp2_create_fixture_fullstack, chttp2_init_client_fullstack,
-   chttp2_init_server_fullstack, chttp2_tear_down_fullstack},
+    {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
+     chttp2_create_fixture_fullstack, chttp2_init_client_fullstack,
+     chttp2_init_server_fullstack, chttp2_tear_down_fullstack},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
 
   grpc_platform_become_multipoller = grpc_poll_become_multipoller;
 
-  grpc_test_init (argc, argv);
-  grpc_init ();
+  grpc_test_init(argc, argv);
+  grpc_init();
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/h2_uds.c b/test/core/end2end/fixtures/h2_uds.c
index 6b664d3aec..59d39bbb0f 100644
--- a/test/core/end2end/fixtures/h2_uds.c
+++ b/test/core/end2end/fixtures/h2_uds.c
@@ -54,78 +54,69 @@
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
-typedef struct fullstack_fixture_data
-{
+typedef struct fullstack_fixture_data {
   char *localaddr;
 } fullstack_fixture_data;
 
 static int unique = 1;
 
-static grpc_end2end_test_fixture
-chttp2_create_fixture_fullstack (grpc_channel_args * client_args, grpc_channel_args * server_args)
-{
+static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
+    grpc_channel_args *client_args, grpc_channel_args *server_args) {
   grpc_end2end_test_fixture f;
-  fullstack_fixture_data *ffd = gpr_malloc (sizeof (fullstack_fixture_data));
-  memset (&f, 0, sizeof (f));
+  fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data));
+  memset(&f, 0, sizeof(f));
 
-  gpr_asprintf (&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid (), unique++);
+  gpr_asprintf(&ffd->localaddr, "unix:/tmp/grpc_fullstack_test.%d.%d", getpid(),
+               unique++);
 
   f.fixture_data = ffd;
-  f.cq = grpc_completion_queue_create (NULL);
+  f.cq = grpc_completion_queue_create(NULL);
 
   return f;
 }
 
-void
-chttp2_init_client_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * client_args)
-{
+void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f,
+                                  grpc_channel_args *client_args) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  f->client = grpc_insecure_channel_create (ffd->localaddr, client_args, NULL);
+  f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL);
 }
 
-void
-chttp2_init_server_fullstack (grpc_end2end_test_fixture * f, grpc_channel_args * server_args)
-{
+void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f,
+                                  grpc_channel_args *server_args) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  if (f->server)
-    {
-      grpc_server_destroy (f->server);
-    }
-  f->server = grpc_server_create (server_args, NULL);
-  grpc_server_register_completion_queue (f->server, f->cq, NULL);
-  GPR_ASSERT (grpc_server_add_insecure_http2_port (f->server, ffd->localaddr));
-  grpc_server_start (f->server);
+  if (f->server) {
+    grpc_server_destroy(f->server);
+  }
+  f->server = grpc_server_create(server_args, NULL);
+  grpc_server_register_completion_queue(f->server, f->cq, NULL);
+  GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr));
+  grpc_server_start(f->server);
 }
 
-void
-chttp2_tear_down_fullstack (grpc_end2end_test_fixture * f)
-{
+void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) {
   fullstack_fixture_data *ffd = f->fixture_data;
-  gpr_free (ffd->localaddr);
-  gpr_free (ffd);
+  gpr_free(ffd->localaddr);
+  gpr_free(ffd);
 }
 
 /* All test configurations */
 static grpc_end2end_test_config configs[] = {
-  {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
-   chttp2_create_fixture_fullstack, chttp2_init_client_fullstack,
-   chttp2_init_server_fullstack, chttp2_tear_down_fullstack},
+    {"chttp2/fullstack_uds", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION,
+     chttp2_create_fixture_fullstack, chttp2_init_client_fullstack,
+     chttp2_init_server_fullstack, chttp2_tear_down_fullstack},
 };
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
   size_t i;
 
-  grpc_test_init (argc, argv);
-  grpc_init ();
+  grpc_test_init(argc, argv);
+  grpc_init();
 
-  for (i = 0; i < sizeof (configs) / sizeof (*configs); i++)
-    {
-      grpc_end2end_tests (configs[i]);
-    }
+  for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
+    grpc_end2end_tests(configs[i]);
+  }
 
-  grpc_shutdown ();
+  grpc_shutdown();
 
   return 0;
 }
diff --git a/test/core/end2end/fixtures/proxy.c b/test/core/end2end/fixtures/proxy.c
index 14a55fb852..434e75dd15 100644
--- a/test/core/end2end/fixtures/proxy.c
+++ b/test/core/end2end/fixtures/proxy.c
@@ -44,8 +44,7 @@
 
 #include "test/core/util/port.h"
 
-struct grpc_end2end_proxy
-{
+struct grpc_end2end_proxy {
   gpr_thd_id thd;
   char *proxy_port;
   char *server_port;
@@ -61,14 +60,12 @@ struct grpc_end2end_proxy
   grpc_metadata_array new_call_metadata;
 };
 
-typedef struct
-{
-  void (*func) (void *arg, int success);
+typedef struct {
+  void (*func)(void *arg, int success);
   void *arg;
 } closure;
 
-typedef struct
-{
+typedef struct {
   gpr_refcount refs;
   grpc_end2end_proxy *proxy;
 
@@ -89,383 +86,351 @@ typedef struct
   int c2p_server_cancelled;
 } proxy_call;
 
-static void thread_main (void *arg);
-static void request_call (grpc_end2end_proxy * proxy);
+static void thread_main(void *arg);
+static void request_call(grpc_end2end_proxy *proxy);
 
-grpc_end2end_proxy *
-grpc_end2end_proxy_create (const grpc_end2end_proxy_def * def)
-{
-  gpr_thd_options opt = gpr_thd_options_default ();
-  int proxy_port = grpc_pick_unused_port_or_die ();
-  int server_port = grpc_pick_unused_port_or_die ();
+grpc_end2end_proxy *grpc_end2end_proxy_create(
+    const grpc_end2end_proxy_def *def) {
+  gpr_thd_options opt = gpr_thd_options_default();
+  int proxy_port = grpc_pick_unused_port_or_die();
+  int server_port = grpc_pick_unused_port_or_die();
 
-  grpc_end2end_proxy *proxy = gpr_malloc (sizeof (*proxy));
-  memset (proxy, 0, sizeof (*proxy));
+  grpc_end2end_proxy *proxy = gpr_malloc(sizeof(*proxy));
+  memset(proxy, 0, sizeof(*proxy));
 
-  gpr_join_host_port (&proxy->proxy_port, "localhost", proxy_port);
-  gpr_join_host_port (&proxy->server_port, "localhost", server_port);
+  gpr_join_host_port(&proxy->proxy_port, "localhost", proxy_port);
+  gpr_join_host_port(&proxy->server_port, "localhost", server_port);
 
-  gpr_log (GPR_DEBUG, "PROXY ADDR:%s BACKEND:%s", proxy->proxy_port, proxy->server_port);
+  gpr_log(GPR_DEBUG, "PROXY ADDR:%s BACKEND:%s", proxy->proxy_port,
+          proxy->server_port);
 
-  proxy->cq = grpc_completion_queue_create (NULL);
-  proxy->server = def->create_server (proxy->proxy_port);
-  proxy->client = def->create_client (proxy->server_port);
+  proxy->cq = grpc_completion_queue_create(NULL);
+  proxy->server = def->create_server(proxy->proxy_port);
+  proxy->client = def->create_client(proxy->server_port);
 
-  grpc_server_register_completion_queue (proxy->server, proxy->cq, NULL);
-  grpc_server_start (proxy->server);
+  grpc_server_register_completion_queue(proxy->server, proxy->cq, NULL);
+  grpc_server_start(proxy->server);
 
-  gpr_thd_options_set_joinable (&opt);
-  GPR_ASSERT (gpr_thd_new (&proxy->thd, thread_main, proxy, &opt));
+  gpr_thd_options_set_joinable(&opt);
+  GPR_ASSERT(gpr_thd_new(&proxy->thd, thread_main, proxy, &opt));
 
-  request_call (proxy);
+  request_call(proxy);
 
   return proxy;
 }
 
-static closure *
-new_closure (void (*func) (void *arg, int success), void *arg)
-{
-  closure *cl = gpr_malloc (sizeof (*cl));
+static closure *new_closure(void (*func)(void *arg, int success), void *arg) {
+  closure *cl = gpr_malloc(sizeof(*cl));
   cl->func = func;
   cl->arg = arg;
   return cl;
 }
 
-static void
-shutdown_complete (void *arg, int success)
-{
+static void shutdown_complete(void *arg, int success) {
   grpc_end2end_proxy *proxy = arg;
   proxy->shutdown = 1;
-  grpc_completion_queue_shutdown (proxy->cq);
+  grpc_completion_queue_shutdown(proxy->cq);
 }
 
-void
-grpc_end2end_proxy_destroy (grpc_end2end_proxy * proxy)
-{
-  grpc_server_shutdown_and_notify (proxy->server, proxy->cq, new_closure (shutdown_complete, proxy));
-  gpr_thd_join (proxy->thd);
-  gpr_free (proxy->proxy_port);
-  gpr_free (proxy->server_port);
-  grpc_server_destroy (proxy->server);
-  grpc_channel_destroy (proxy->client);
-  grpc_completion_queue_destroy (proxy->cq);
-  grpc_call_details_destroy (&proxy->new_call_details);
-  gpr_free (proxy);
+void grpc_end2end_proxy_destroy(grpc_end2end_proxy *proxy) {
+  grpc_server_shutdown_and_notify(proxy->server, proxy->cq,
+                                  new_closure(shutdown_complete, proxy));
+  gpr_thd_join(proxy->thd);
+  gpr_free(proxy->proxy_port);
+  gpr_free(proxy->server_port);
+  grpc_server_destroy(proxy->server);
+  grpc_channel_destroy(proxy->client);
+  grpc_completion_queue_destroy(proxy->cq);
+  grpc_call_details_destroy(&proxy->new_call_details);
+  gpr_free(proxy);
 }
 
-static void
-unrefpc (proxy_call * pc, const char *reason)
-{
-  if (gpr_unref (&pc->refs))
-    {
-      grpc_call_destroy (pc->c2p);
-      grpc_call_destroy (pc->p2s);
-      grpc_metadata_array_destroy (&pc->c2p_initial_metadata);
-      grpc_metadata_array_destroy (&pc->p2s_initial_metadata);
-      grpc_metadata_array_destroy (&pc->p2s_trailing_metadata);
-      gpr_free (pc->p2s_status_details);
-      gpr_free (pc);
-    }
+static void unrefpc(proxy_call *pc, const char *reason) {
+  if (gpr_unref(&pc->refs)) {
+    grpc_call_destroy(pc->c2p);
+    grpc_call_destroy(pc->p2s);
+    grpc_metadata_array_destroy(&pc->c2p_initial_metadata);
+    grpc_metadata_array_destroy(&pc->p2s_initial_metadata);
+    grpc_metadata_array_destroy(&pc->p2s_trailing_metadata);
+    gpr_free(pc->p2s_status_details);
+    gpr_free(pc);
+  }
 }
 
-static void
-refpc (proxy_call * pc, const char *reason)
-{
-  gpr_ref (&pc->refs);
-}
+static void refpc(proxy_call *pc, const char *reason) { gpr_ref(&pc->refs); }
 
-static void
-on_c2p_sent_initial_metadata (void *arg, int success)
-{
+static void on_c2p_sent_initial_metadata(void *arg, int success) {
   proxy_call *pc = arg;
-  unrefpc (pc, "on_c2p_sent_initial_metadata");
+  unrefpc(pc, "on_c2p_sent_initial_metadata");
 }
 
-static void
-on_p2s_recv_initial_metadata (void *arg, int success)
-{
+static void on_p2s_recv_initial_metadata(void *arg, int success) {
   proxy_call *pc = arg;
   grpc_op op;
   grpc_call_error err;
 
-  if (!pc->proxy->shutdown)
-    {
-      op.op = GRPC_OP_SEND_INITIAL_METADATA;
-      op.flags = 0;
-      op.reserved = NULL;
-      op.data.send_initial_metadata.count = pc->p2s_initial_metadata.count;
-      op.data.send_initial_metadata.metadata = pc->p2s_initial_metadata.metadata;
-      refpc (pc, "on_c2p_sent_initial_metadata");
-      err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_sent_initial_metadata, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-    }
-
-  unrefpc (pc, "on_p2s_recv_initial_metadata");
+  if (!pc->proxy->shutdown) {
+    op.op = GRPC_OP_SEND_INITIAL_METADATA;
+    op.flags = 0;
+    op.reserved = NULL;
+    op.data.send_initial_metadata.count = pc->p2s_initial_metadata.count;
+    op.data.send_initial_metadata.metadata = pc->p2s_initial_metadata.metadata;
+    refpc(pc, "on_c2p_sent_initial_metadata");
+    err = grpc_call_start_batch(
+        pc->c2p, &op, 1, new_closure(on_c2p_sent_initial_metadata, pc), NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+  }
+
+  unrefpc(pc, "on_p2s_recv_initial_metadata");
 }
 
-static void
-on_p2s_sent_initial_metadata (void *arg, int success)
-{
+static void on_p2s_sent_initial_metadata(void *arg, int success) {
   proxy_call *pc = arg;
-  unrefpc (pc, "on_p2s_sent_initial_metadata");
+  unrefpc(pc, "on_p2s_sent_initial_metadata");
 }
 
-static void on_c2p_recv_msg (void *arg, int success);
+static void on_c2p_recv_msg(void *arg, int success);
 
-static void
-on_p2s_sent_message (void *arg, int success)
-{
+static void on_p2s_sent_message(void *arg, int success) {
   proxy_call *pc = arg;
   grpc_op op;
   grpc_call_error err;
 
-  grpc_byte_buffer_destroy (pc->c2p_msg);
-  if (!pc->proxy->shutdown && success)
-    {
-      op.op = GRPC_OP_RECV_MESSAGE;
-      op.flags = 0;
-      op.reserved = NULL;
-      op.data.recv_message = &pc->c2p_msg;
-      refpc (pc, "on_c2p_recv_msg");
-      err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_recv_msg, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-    }
-
-  unrefpc (pc, "on_p2s_sent_message");
+  grpc_byte_buffer_destroy(pc->c2p_msg);
+  if (!pc->proxy->shutdown && success) {
+    op.op = GRPC_OP_RECV_MESSAGE;
+    op.flags = 0;
+    op.reserved = NULL;
+    op.data.recv_message = &pc->c2p_msg;
+    refpc(pc, "on_c2p_recv_msg");
+    err = grpc_call_start_batch(pc->c2p, &op, 1,
+                                new_closure(on_c2p_recv_msg, pc), NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+  }
+
+  unrefpc(pc, "on_p2s_sent_message");
 }
 
-static void
-on_p2s_sent_close (void *arg, int success)
-{
+static void on_p2s_sent_close(void *arg, int success) {
   proxy_call *pc = arg;
-  unrefpc (pc, "on_p2s_sent_close");
+  unrefpc(pc, "on_p2s_sent_close");
 }
 
-static void
-on_c2p_recv_msg (void *arg, int success)
-{
+static void on_c2p_recv_msg(void *arg, int success) {
   proxy_call *pc = arg;
   grpc_op op;
   grpc_call_error err;
 
-  if (!pc->proxy->shutdown && success)
-    {
-      if (pc->c2p_msg != NULL)
-	{
-	  op.op = GRPC_OP_SEND_MESSAGE;
-	  op.flags = 0;
-	  op.reserved = NULL;
-	  op.data.send_message = pc->c2p_msg;
-	  refpc (pc, "on_p2s_sent_message");
-	  err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_sent_message, pc), NULL);
-	  GPR_ASSERT (err == GRPC_CALL_OK);
-	}
-      else
-	{
-	  op.op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
-	  op.flags = 0;
-	  op.reserved = NULL;
-	  refpc (pc, "on_p2s_sent_close");
-	  err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_sent_close, pc), NULL);
-	  GPR_ASSERT (err == GRPC_CALL_OK);
-	}
+  if (!pc->proxy->shutdown && success) {
+    if (pc->c2p_msg != NULL) {
+      op.op = GRPC_OP_SEND_MESSAGE;
+      op.flags = 0;
+      op.reserved = NULL;
+      op.data.send_message = pc->c2p_msg;
+      refpc(pc, "on_p2s_sent_message");
+      err = grpc_call_start_batch(pc->p2s, &op, 1,
+                                  new_closure(on_p2s_sent_message, pc), NULL);
+      GPR_ASSERT(err == GRPC_CALL_OK);
+    } else {
+      op.op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
+      op.flags = 0;
+      op.reserved = NULL;
+      refpc(pc, "on_p2s_sent_close");
+      err = grpc_call_start_batch(pc->p2s, &op, 1,
+                                  new_closure(on_p2s_sent_close, pc), NULL);
+      GPR_ASSERT(err == GRPC_CALL_OK);
     }
+  }
 
-  unrefpc (pc, "on_c2p_recv_msg");
+  unrefpc(pc, "on_c2p_recv_msg");
 }
 
-static void on_p2s_recv_msg (void *arg, int success);
+static void on_p2s_recv_msg(void *arg, int success);
 
-static void
-on_c2p_sent_message (void *arg, int success)
-{
+static void on_c2p_sent_message(void *arg, int success) {
   proxy_call *pc = arg;
   grpc_op op;
   grpc_call_error err;
 
-  grpc_byte_buffer_destroy (pc->p2s_msg);
-  if (!pc->proxy->shutdown && success)
-    {
-      op.op = GRPC_OP_RECV_MESSAGE;
-      op.flags = 0;
-      op.reserved = NULL;
-      op.data.recv_message = &pc->p2s_msg;
-      refpc (pc, "on_p2s_recv_msg");
-      err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_recv_msg, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-    }
-
-  unrefpc (pc, "on_c2p_sent_message");
+  grpc_byte_buffer_destroy(pc->p2s_msg);
+  if (!pc->proxy->shutdown && success) {
+    op.op = GRPC_OP_RECV_MESSAGE;
+    op.flags = 0;
+    op.reserved = NULL;
+    op.data.recv_message = &pc->p2s_msg;
+    refpc(pc, "on_p2s_recv_msg");
+    err = grpc_call_start_batch(pc->p2s, &op, 1,
+                                new_closure(on_p2s_recv_msg, pc), NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+  }
+
+  unrefpc(pc, "on_c2p_sent_message");
 }
 
-static void
-on_p2s_recv_msg (void *arg, int success)
-{
+static void on_p2s_recv_msg(void *arg, int success) {
   proxy_call *pc = arg;
   grpc_op op;
   grpc_call_error err;
 
-  if (!pc->proxy->shutdown && success && pc->p2s_msg)
-    {
-      op.op = GRPC_OP_SEND_MESSAGE;
-      op.flags = 0;
-      op.reserved = NULL;
-      op.data.send_message = pc->p2s_msg;
-      refpc (pc, "on_c2p_sent_message");
-      err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_sent_message, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-    }
-  unrefpc (pc, "on_p2s_recv_msg");
+  if (!pc->proxy->shutdown && success && pc->p2s_msg) {
+    op.op = GRPC_OP_SEND_MESSAGE;
+    op.flags = 0;
+    op.reserved = NULL;
+    op.data.send_message = pc->p2s_msg;
+    refpc(pc, "on_c2p_sent_message");
+    err = grpc_call_start_batch(pc->c2p, &op, 1,
+                                new_closure(on_c2p_sent_message, pc), NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+  }
+  unrefpc(pc, "on_p2s_recv_msg");
 }
 
-static void
-on_c2p_sent_status (void *arg, int success)
-{
+static void on_c2p_sent_status(void *arg, int success) {
   proxy_call *pc = arg;
-  unrefpc (pc, "on_c2p_sent_status");
+  unrefpc(pc, "on_c2p_sent_status");
 }
 
-static void
-on_p2s_status (void *arg, int success)
-{
+static void on_p2s_status(void *arg, int success) {
   proxy_call *pc = arg;
   grpc_op op;
   grpc_call_error err;
 
-  if (!pc->proxy->shutdown)
-    {
-      GPR_ASSERT (success);
-      op.op = GRPC_OP_SEND_STATUS_FROM_SERVER;
-      op.flags = 0;
-      op.reserved = NULL;
-      op.data.send_status_from_server.trailing_metadata_count = pc->p2s_trailing_metadata.count;
-      op.data.send_status_from_server.trailing_metadata = pc->p2s_trailing_metadata.metadata;
-      op.data.send_status_from_server.status = pc->p2s_status;
-      op.data.send_status_from_server.status_details = pc->p2s_status_details;
-      refpc (pc, "on_c2p_sent_status");
-      err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_sent_status, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-    }
-
-  unrefpc (pc, "on_p2s_status");
+  if (!pc->proxy->shutdown) {
+    GPR_ASSERT(success);
+    op.op = GRPC_OP_SEND_STATUS_FROM_SERVER;
+    op.flags = 0;
+    op.reserved = NULL;
+    op.data.send_status_from_server.trailing_metadata_count =
+        pc->p2s_trailing_metadata.count;
+    op.data.send_status_from_server.trailing_metadata =
+        pc->p2s_trailing_metadata.metadata;
+    op.data.send_status_from_server.status = pc->p2s_status;
+    op.data.send_status_from_server.status_details = pc->p2s_status_details;
+    refpc(pc, "on_c2p_sent_status");
+    err = grpc_call_start_batch(pc->c2p, &op, 1,
+                                new_closure(on_c2p_sent_status, pc), NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+  }
+
+  unrefpc(pc, "on_p2s_status");
 }
 
-static void
-on_c2p_closed (void *arg, int success)
-{
+static void on_c2p_closed(void *arg, int success) {
   proxy_call *pc = arg;
-  unrefpc (pc, "on_c2p_closed");
+  unrefpc(pc, "on_c2p_closed");
 }
 
-static void
-on_new_call (void *arg, int success)
-{
+static void on_new_call(void *arg, int success) {
   grpc_end2end_proxy *proxy = arg;
   grpc_call_error err;
 
-  if (success)
-    {
-      grpc_op op;
-      proxy_call *pc = gpr_malloc (sizeof (*pc));
-      memset (pc, 0, sizeof (*pc));
-      pc->proxy = proxy;
-      GPR_SWAP (grpc_metadata_array, pc->c2p_initial_metadata, proxy->new_call_metadata);
-      pc->c2p = proxy->new_call;
-      pc->p2s = grpc_channel_create_call (proxy->client, pc->c2p, GRPC_PROPAGATE_DEFAULTS, proxy->cq, proxy->new_call_details.method, proxy->new_call_details.host, proxy->new_call_details.deadline, NULL);
-      gpr_ref_init (&pc->refs, 1);
-
-      op.flags = 0;
-      op.reserved = NULL;
-
-      op.op = GRPC_OP_RECV_INITIAL_METADATA;
-      op.data.recv_initial_metadata = &pc->p2s_initial_metadata;
-      refpc (pc, "on_p2s_recv_initial_metadata");
-      err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_recv_initial_metadata, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-
-      op.op = GRPC_OP_SEND_INITIAL_METADATA;
-      op.data.send_initial_metadata.count = pc->c2p_initial_metadata.count;
-      op.data.send_initial_metadata.metadata = pc->c2p_initial_metadata.metadata;
-      refpc (pc, "on_p2s_sent_initial_metadata");
-      err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_sent_initial_metadata, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-
-      op.op = GRPC_OP_RECV_MESSAGE;
-      op.data.recv_message = &pc->c2p_msg;
-      refpc (pc, "on_c2p_recv_msg");
-      err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_recv_msg, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-
-      op.op = GRPC_OP_RECV_MESSAGE;
-      op.data.recv_message = &pc->p2s_msg;
-      refpc (pc, "on_p2s_recv_msg");
-      err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_recv_msg, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-
-      op.op = GRPC_OP_RECV_STATUS_ON_CLIENT;
-      op.data.recv_status_on_client.trailing_metadata = &pc->p2s_trailing_metadata;
-      op.data.recv_status_on_client.status = &pc->p2s_status;
-      op.data.recv_status_on_client.status_details = &pc->p2s_status_details;
-      op.data.recv_status_on_client.status_details_capacity = &pc->p2s_status_details_capacity;
-      refpc (pc, "on_p2s_status");
-      err = grpc_call_start_batch (pc->p2s, &op, 1, new_closure (on_p2s_status, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-
-      op.op = GRPC_OP_RECV_CLOSE_ON_SERVER;
-      op.data.recv_close_on_server.cancelled = &pc->c2p_server_cancelled;
-      refpc (pc, "on_c2p_closed");
-      err = grpc_call_start_batch (pc->c2p, &op, 1, new_closure (on_c2p_closed, pc), NULL);
-      GPR_ASSERT (err == GRPC_CALL_OK);
-
-      request_call (proxy);
-
-      unrefpc (pc, "init");
-    }
-  else
-    {
-      GPR_ASSERT (proxy->new_call == NULL);
-    }
+  if (success) {
+    grpc_op op;
+    proxy_call *pc = gpr_malloc(sizeof(*pc));
+    memset(pc, 0, sizeof(*pc));
+    pc->proxy = proxy;
+    GPR_SWAP(grpc_metadata_array, pc->c2p_initial_metadata,
+             proxy->new_call_metadata);
+    pc->c2p = proxy->new_call;
+    pc->p2s = grpc_channel_create_call(
+        proxy->client, pc->c2p, GRPC_PROPAGATE_DEFAULTS, proxy->cq,
+        proxy->new_call_details.method, proxy->new_call_details.host,
+        proxy->new_call_details.deadline, NULL);
+    gpr_ref_init(&pc->refs, 1);
+
+    op.flags = 0;
+    op.reserved = NULL;
+
+    op.op = GRPC_OP_RECV_INITIAL_METADATA;
+    op.data.recv_initial_metadata = &pc->p2s_initial_metadata;
+    refpc(pc, "on_p2s_recv_initial_metadata");
+    err = grpc_call_start_batch(
+        pc->p2s, &op, 1, new_closure(on_p2s_recv_initial_metadata, pc), NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+
+    op.op = GRPC_OP_SEND_INITIAL_METADATA;
+    op.data.send_initial_metadata.count = pc->c2p_initial_metadata.count;
+    op.data.send_initial_metadata.metadata = pc->c2p_initial_metadata.metadata;
+    refpc(pc, "on_p2s_sent_initial_metadata");
+    err = grpc_call_start_batch(
+        pc->p2s, &op, 1, new_closure(on_p2s_sent_initial_metadata, pc), NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+
+    op.op = GRPC_OP_RECV_MESSAGE;
+    op.data.recv_message = &pc->c2p_msg;
+    refpc(pc, "on_c2p_recv_msg");
+    err = grpc_call_start_batch(pc->c2p, &op, 1,
+                                new_closure(on_c2p_recv_msg, pc), NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+
+    op.op = GRPC_OP_RECV_MESSAGE;
+    op.data.recv_message = &pc->p2s_msg;
+    refpc(pc, "on_p2s_recv_msg");
+    err = grpc_call_start_batch(pc->p2s, &op, 1,
+                                new_closure(on_p2s_recv_msg, pc), NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+
+    op.op = GRPC_OP_RECV_STATUS_ON_CLIENT;
+    op.data.recv_status_on_client.trailing_metadata =
+        &pc->p2s_trailing_metadata;
+    op.data.recv_status_on_client.status = &pc->p2s_status;
+    op.data.recv_status_on_client.status_details = &pc->p2s_status_details;
+    op.data.recv_status_on_client.status_details_capacity =
+        &pc->p2s_status_details_capacity;
+    refpc(pc, "on_p2s_status");
+    err = grpc_call_start_batch(pc->p2s, &op, 1, new_closure(on_p2s_status, pc),
+                                NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+
+    op.op = GRPC_OP_RECV_CLOSE_ON_SERVER;
+    op.data.recv_close_on_server.cancelled = &pc->c2p_server_cancelled;
+    refpc(pc, "on_c2p_closed");
+    err = grpc_call_start_batch(pc->c2p, &op, 1, new_closure(on_c2p_closed, pc),
+                                NULL);
+    GPR_ASSERT(err == GRPC_CALL_OK);
+
+    request_call(proxy);
+
+    unrefpc(pc, "init");
+  } else {
+    GPR_ASSERT(proxy->new_call == NULL);
+  }
 }
 
-static void
-request_call (grpc_end2end_proxy * proxy)
-{
+static void request_call(grpc_end2end_proxy *proxy) {
   proxy->new_call = NULL;
-  GPR_ASSERT (GRPC_CALL_OK == grpc_server_request_call (proxy->server, &proxy->new_call, &proxy->new_call_details, &proxy->new_call_metadata, proxy->cq, proxy->cq, new_closure (on_new_call, proxy)));
+  GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(
+                                 proxy->server, &proxy->new_call,
+                                 &proxy->new_call_details,
+                                 &proxy->new_call_metadata, proxy->cq,
+                                 proxy->cq, new_closure(on_new_call, proxy)));
 }
 
-static void
-thread_main (void *arg)
-{
+static void thread_main(void *arg) {
   grpc_end2end_proxy *proxy = arg;
   closure *cl;
-  for (;;)
-    {
-      grpc_event ev = grpc_completion_queue_next (proxy->cq, gpr_inf_future (GPR_CLOCK_MONOTONIC), NULL);
-      switch (ev.type)
-	{
-	case GRPC_QUEUE_TIMEOUT:
-	  gpr_log (GPR_ERROR, "Should never reach here");
-	  abort ();
-	case GRPC_QUEUE_SHUTDOWN:
-	  return;
-	case GRPC_OP_COMPLETE:
-	  cl = ev.tag;
-	  cl->func (cl->arg, ev.success);
-	  gpr_free (cl);
-	  break;
-	}
+  for (;;) {
+    grpc_event ev = grpc_completion_queue_next(
+        proxy->cq, gpr_inf_future(GPR_CLOCK_MONOTONIC), NULL);
+    switch (ev.type) {
+      case GRPC_QUEUE_TIMEOUT:
+        gpr_log(GPR_ERROR, "Should never reach here");
+        abort();
+      case GRPC_QUEUE_SHUTDOWN:
+        return;
+      case GRPC_OP_COMPLETE:
+        cl = ev.tag;
+        cl->func(cl->arg, ev.success);
+        gpr_free(cl);
+        break;
     }
+  }
 }
 
-const char *
-grpc_end2end_proxy_get_client_target (grpc_end2end_proxy * proxy)
-{
+const char *grpc_end2end_proxy_get_client_target(grpc_end2end_proxy *proxy) {
   return proxy->proxy_port;
 }
 
-const char *
-grpc_end2end_proxy_get_server_port (grpc_end2end_proxy * proxy)
-{
+const char *grpc_end2end_proxy_get_server_port(grpc_end2end_proxy *proxy) {
   return proxy->server_port;
 }
diff --git a/test/core/end2end/fixtures/proxy.h b/test/core/end2end/fixtures/proxy.h
index 616fa1e10e..c1cf01d39a 100644
--- a/test/core/end2end/fixtures/proxy.h
+++ b/test/core/end2end/fixtures/proxy.h
@@ -40,16 +40,16 @@
 
 typedef struct grpc_end2end_proxy grpc_end2end_proxy;
 
-typedef struct grpc_end2end_proxy_def
-{
-  grpc_server *(*create_server) (const char *port);
-  grpc_channel *(*create_client) (const char *target);
+typedef struct grpc_end2end_proxy_def {
+  grpc_server *(*create_server)(const char *port);
+  grpc_channel *(*create_client)(const char *target);
 } grpc_end2end_proxy_def;
 
-grpc_end2end_proxy *grpc_end2end_proxy_create (const grpc_end2end_proxy_def * def);
-void grpc_end2end_proxy_destroy (grpc_end2end_proxy * proxy);
+grpc_end2end_proxy *grpc_end2end_proxy_create(
+    const grpc_end2end_proxy_def *def);
+void grpc_end2end_proxy_destroy(grpc_end2end_proxy *proxy);
 
-const char *grpc_end2end_proxy_get_client_target (grpc_end2end_proxy * proxy);
-const char *grpc_end2end_proxy_get_server_port (grpc_end2end_proxy * proxy);
+const char *grpc_end2end_proxy_get_client_target(grpc_end2end_proxy *proxy);
+const char *grpc_end2end_proxy_get_server_port(grpc_end2end_proxy *proxy);
 
 #endif /* GRPC_TEST_CORE_END2END_FIXTURES_PROXY_H */