Merge branch 'internal-canary' of github.com:ctiller/grpc into internal-canary

test/core/internal_api_canaries/iomgr.c

@@ -80,10 +80,9 @@ static void test_code(void) {
 
   grpc_endpoint endpoint;
   grpc_endpoint_vtable vtable = {
-      grpc_endpoint_read,           grpc_endpoint_write,
+      grpc_endpoint_read, grpc_endpoint_write, grpc_endpoint_add_to_pollset,
-      grpc_endpoint_add_to_pollset, grpc_endpoint_add_to_pollset_set,
+      grpc_endpoint_add_to_pollset_set, grpc_endpoint_shutdown,
-      grpc_endpoint_shutdown,       grpc_endpoint_destroy,
+      grpc_endpoint_destroy, grpc_endpoint_get_peer};
-      grpc_endpoint_get_peer};
   endpoint.vtable = &vtable;
 
   /* exec_ctx.h */

test/core/internal_api_canaries/transport.c

@@ -45,13 +45,10 @@
 static void test_code(void) {
   /* transport_impl.h */
   grpc_transport transport;
-  grpc_transport_vtable vtable = {12345,
+  grpc_transport_vtable vtable = {
-                                  grpc_transport_init_stream,
+      12345, grpc_transport_init_stream, grpc_transport_set_pollset,
-                                  grpc_transport_set_pollset,
+      grpc_transport_perform_stream_op, grpc_transport_perform_op,
-                                  grpc_transport_perform_stream_op,
+      grpc_transport_destroy_stream, grpc_transport_destroy,
-                                  grpc_transport_perform_op,
-                                  grpc_transport_destroy_stream,
-                                  grpc_transport_destroy,
       grpc_transport_get_peer};
   transport.vtable = &vtable;