Merge remote-tracking branch 'origin/master' into unary_stream_single_threaded_test

CMakeLists.txt

@@ -9443,10 +9443,6 @@ if(_gRPC_PLATFORM_LINUX)
       ${CMAKE_CURRENT_SOURCE_DIR}
       ${CMAKE_CURRENT_SOURCE_DIR}/include
       ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-      ${_gRPC_BENCHMARK_INCLUDE_DIR}
-      ${_gRPC_CARES_INCLUDE_DIR}
-      ${_gRPC_GFLAGS_INCLUDE_DIR}
-      ${_gRPC_PROTOBUF_INCLUDE_DIR}
       ${_gRPC_SSL_INCLUDE_DIR}
       ${_gRPC_UPB_GENERATED_DIR}
       ${_gRPC_UPB_GRPC_GENERATED_DIR}

src/core/tsi/alts/handshaker/alts_handshaker_client.cc

@@ -429,9 +429,11 @@ static void handshaker_client_destruct(alts_handshaker_client* c) {
     // TODO(apolcyn): we could remove this indirection and call
     // grpc_call_unref inline if there was an internal variant of
     // grpc_call_unref that didn't need to flush an ExecCtx.
-    GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(handshaker_call_unref, client->call,
-                                           grpc_schedule_on_exec_ctx),
-                       GRPC_ERROR_NONE);
+    grpc_core::ExecCtx::Run(
+        DEBUG_LOCATION,
+        GRPC_CLOSURE_CREATE(handshaker_call_unref, client->call,
+                            grpc_schedule_on_exec_ctx),
+        GRPC_ERROR_NONE);
   }
 }
 

src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc

@@ -419,7 +419,7 @@ static tsi_result handshaker_next(
     // stack. Doing so avoids potential lock cycles between g_init_mu and other
     // mutexes within core that might be held on the current call stack
     // (note that g_init_mu gets acquired during channel creation).
-    GRPC_CLOSURE_SCHED(&args->closure, GRPC_ERROR_NONE);
+    grpc_core::ExecCtx::Run(DEBUG_LOCATION, &args->closure, GRPC_ERROR_NONE);
   } else {
     tsi_result ok = alts_tsi_handshaker_continue_handshaker_next(
         handshaker, received_bytes, received_bytes_size, cb, user_data);