Address some PR comments

16 files changed, 80 insertions, 92 deletions

diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc
index df2ed0ecd0..4cf39eab48 100644
--- a/test/cpp/end2end/client_lb_end2end_test.cc
+++ b/test/cpp/end2end/client_lb_end2end_test.cc
@@ -133,7 +133,6 @@ class ClientLbEnd2endTest : public ::testing::Test {
                                                        fake_result);
     grpc_channel_args_destroy(fake_result);
     grpc_lb_addresses_destroy(addresses);
-    grpc_exec_ctx_finish();
   }
 
   void ResetStub(const grpc::string& lb_policy_name = "") {
diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc
index 62d7094d4c..962d5a7e68 100644
--- a/test/cpp/end2end/grpclb_end2end_test.cc
+++ b/test/cpp/end2end/grpclb_end2end_test.cc
@@ -470,7 +470,6 @@ class GrpclbEnd2endTest : public ::testing::Test {
     grpc_fake_resolver_response_generator_set_response(response_generator_,
                                                        &fake_result);
     grpc_lb_addresses_destroy(addresses);
-    grpc_exec_ctx_finish();
   }
 
   const std::vector<int> GetBackendPorts(const size_t start_index = 0) const {
diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc
index c2c6c0b337..6f6dd3c4df 100644
--- a/test/cpp/grpclb/grpclb_test.cc
+++ b/test/cpp/grpclb/grpclb_test.cc
@@ -603,7 +603,6 @@ static void setup_client(const server_fixture* lb_server,
   grpc_channel_credentials_unref(fake_creds);
   grpc_channel_args_destroy(args);
   grpc_fake_resolver_response_generator_unref(response_generator);
-  grpc_exec_ctx_finish();
 }
 
 static void teardown_client(client_fixture* cf) {
diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc
index eac1c753c7..47b984bc28 100644
--- a/test/cpp/microbenchmarks/bm_call_create.cc
+++ b/test/cpp/microbenchmarks/bm_call_create.cc
@@ -534,7 +534,7 @@ static void BM_IsolatedFilter(benchmark::State& state) {
                                   ? &dummy_transport::dummy_transport
                                   : nullptr,
                               "CHANNEL", channel_stack)));
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   grpc_call_stack* call_stack =
       static_cast<grpc_call_stack*>(gpr_zalloc(channel_stack->call_stack_size));
   grpc_millis deadline = GRPC_MILLIS_INF_FUTURE;
@@ -558,7 +558,7 @@ static void BM_IsolatedFilter(benchmark::State& state) {
     typename TestOp::Op op(&test_op_data, call_stack);
     grpc_call_stack_destroy(call_stack, &final_info, NULL);
     op.Finish();
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     // recreate arena every 64k iterations to avoid oom
     if (0 == (state.iterations() & 0xffff)) {
       gpr_arena_destroy(call_args.arena);
@@ -567,7 +567,7 @@ static void BM_IsolatedFilter(benchmark::State& state) {
   }
   gpr_arena_destroy(call_args.arena);
   grpc_channel_stack_destroy(channel_stack);
-  grpc_exec_ctx_finish();
+
   gpr_free(channel_stack);
   gpr_free(call_stack);
 
@@ -693,7 +693,6 @@ class IsolatedCallFixture : public TrackCounters {
     {
       ExecCtx _local_exec_ctx;
       channel_ = grpc_channel_create_with_builder(builder, GRPC_CLIENT_CHANNEL);
-      grpc_exec_ctx_finish();
     }
     cq_ = grpc_completion_queue_create_for_next(NULL);
   }
diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
index d6fb3cd369..f822f095a7 100644
--- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
+++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
@@ -55,9 +55,9 @@ static void BM_HpackEncoderInitDestroy(benchmark::State& state) {
   while (state.KeepRunning()) {
     grpc_chttp2_hpack_compressor_init(&c);
     grpc_chttp2_hpack_compressor_destroy(&c);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_HpackEncoderInitDestroy);
@@ -65,7 +65,7 @@ BENCHMARK(BM_HpackEncoderInitDestroy);
 static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) {
   TrackCounters track_counters;
   ExecCtx _local_exec_ctx;
-  grpc_millis saved_now = grpc_exec_ctx_now();
+  grpc_millis saved_now = ExecCtx::Get()->Now();
 
   grpc_metadata_batch b;
   grpc_metadata_batch_init(&b);
@@ -87,12 +87,11 @@ static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) {
     };
     grpc_chttp2_encode_header(&c, NULL, 0, &b, &hopt, &outbuf);
     grpc_slice_buffer_reset_and_unref_internal(&outbuf);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   grpc_metadata_batch_destroy(&b);
   grpc_chttp2_hpack_compressor_destroy(&c);
   grpc_slice_buffer_destroy_internal(&outbuf);
-  grpc_exec_ctx_finish();
 
   std::ostringstream label;
   label << "framing_bytes/iter:"
@@ -145,12 +144,11 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) {
       }
     }
     grpc_slice_buffer_reset_and_unref_internal(&outbuf);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   grpc_metadata_batch_destroy(&b);
   grpc_chttp2_hpack_compressor_destroy(&c);
   grpc_slice_buffer_destroy_internal(&outbuf);
-  grpc_exec_ctx_finish();
 
   std::ostringstream label;
   label << "framing_bytes/iter:"
@@ -432,9 +430,9 @@ static void BM_HpackParserInitDestroy(benchmark::State& state) {
   while (state.KeepRunning()) {
     grpc_chttp2_hpack_parser_init(&p);
     grpc_chttp2_hpack_parser_destroy(&p);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_HpackParserInitDestroy);
@@ -460,12 +458,12 @@ static void BM_HpackParserParseHeader(benchmark::State& state) {
     for (auto slice : benchmark_slices) {
       GPR_ASSERT(GRPC_ERROR_NONE == grpc_chttp2_hpack_parser_parse(&p, slice));
     }
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   for (auto slice : init_slices) grpc_slice_unref(slice);
   for (auto slice : benchmark_slices) grpc_slice_unref(slice);
   grpc_chttp2_hpack_parser_destroy(&p);
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 
diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc
index 3a3547141d..f6e4c2bcc4 100644
--- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc
+++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc
@@ -136,12 +136,9 @@ class Fixture {
     FlushExecCtx();
   }
 
-  void FlushExecCtx() { grpc_exec_ctx_flush(); }
+  void FlushExecCtx() { ExecCtx::Get()->Flush(); }
 
-  ~Fixture() {
-    grpc_transport_destroy(t_);
-    grpc_exec_ctx_finish();
-  }
+  ~Fixture() { grpc_transport_destroy(t_); }
 
   grpc_chttp2_transport* chttp2_transport() {
     return reinterpret_cast<grpc_chttp2_transport*>(t_);
@@ -152,7 +149,6 @@ class Fixture {
 
  private:
   DummyEndpoint* ep_;
-  ExecCtx _local_exec_ctx;
   grpc_transport* t_;
 };
 
@@ -261,6 +257,7 @@ class Stream {
 
 static void BM_StreamCreateDestroy(benchmark::State& state) {
   TrackCounters track_counters;
+  ExecCtx _local_exec_ctx;
   Fixture f(grpc::ChannelArguments(), true);
   Stream s(&f);
   grpc_transport_stream_op_batch op;
@@ -306,6 +303,7 @@ class RepresentativeClientInitialMetadata {
 template <class Metadata>
 static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State& state) {
   TrackCounters track_counters;
+  ExecCtx _local_exec_ctx;
   Fixture f(grpc::ChannelArguments(), true);
   Stream s(&f);
   grpc_transport_stream_op_batch op;
@@ -356,6 +354,7 @@ BENCHMARK_TEMPLATE(BM_StreamCreateSendInitialMetadataDestroy,
 
 static void BM_TransportEmptyOp(benchmark::State& state) {
   TrackCounters track_counters;
+  ExecCtx _local_exec_ctx;
   Fixture f(grpc::ChannelArguments(), true);
   Stream s(&f);
   s.Init(state);
@@ -388,6 +387,7 @@ std::vector<std::unique_ptr<gpr_event>> done_events;
 
 static void BM_TransportStreamSend(benchmark::State& state) {
   TrackCounters track_counters;
+  ExecCtx _local_exec_ctx;
   Fixture f(grpc::ChannelArguments(), true);
   auto s = std::unique_ptr<Stream>(new Stream(&f));
   s->Init(state);
@@ -517,6 +517,7 @@ static grpc_slice CreateIncomingDataSlice(size_t length, size_t frame_size) {
 
 static void BM_TransportStreamRecv(benchmark::State& state) {
   TrackCounters track_counters;
+  ExecCtx _local_exec_ctx;
   Fixture f(grpc::ChannelArguments(), true);
   Stream s(&f);
   s.Init(state);
diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc
index 0e25c3d235..ce8a054515 100644
--- a/test/cpp/microbenchmarks/bm_closure.cc
+++ b/test/cpp/microbenchmarks/bm_closure.cc
@@ -35,7 +35,6 @@ static void BM_NoOpExecCtx(benchmark::State& state) {
   TrackCounters track_counters;
   while (state.KeepRunning()) {
     ExecCtx _local_exec_ctx;
-    grpc_exec_ctx_finish();
   }
   track_counters.Finish(state);
 }
@@ -45,9 +44,9 @@ static void BM_WellFlushed(benchmark::State& state) {
   TrackCounters track_counters;
   ExecCtx _local_exec_ctx;
   while (state.KeepRunning()) {
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_WellFlushed);
@@ -75,7 +74,7 @@ static void BM_ClosureInitAgainstCombiner(benchmark::State& state) {
         &c, DoNothing, NULL, grpc_combiner_scheduler(combiner)));
   }
   GRPC_COMBINER_UNREF(combiner, "finished");
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureInitAgainstCombiner);
@@ -87,9 +86,9 @@ static void BM_ClosureRunOnExecCtx(benchmark::State& state) {
   ExecCtx _local_exec_ctx;
   while (state.KeepRunning()) {
     GRPC_CLOSURE_RUN(&c, GRPC_ERROR_NONE);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureRunOnExecCtx);
@@ -102,7 +101,7 @@ static void BM_ClosureCreateAndRun(benchmark::State& state) {
         GRPC_CLOSURE_CREATE(DoNothing, NULL, grpc_schedule_on_exec_ctx),
         GRPC_ERROR_NONE);
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureCreateAndRun);
@@ -116,7 +115,7 @@ static void BM_ClosureInitAndRun(benchmark::State& state) {
         GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_schedule_on_exec_ctx),
         GRPC_ERROR_NONE);
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureInitAndRun);
@@ -128,9 +127,9 @@ static void BM_ClosureSchedOnExecCtx(benchmark::State& state) {
   ExecCtx _local_exec_ctx;
   while (state.KeepRunning()) {
     GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureSchedOnExecCtx);
@@ -145,9 +144,9 @@ static void BM_ClosureSched2OnExecCtx(benchmark::State& state) {
   while (state.KeepRunning()) {
     GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE);
     GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureSched2OnExecCtx);
@@ -165,9 +164,9 @@ static void BM_ClosureSched3OnExecCtx(benchmark::State& state) {
     GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE);
     GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE);
     GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureSched3OnExecCtx);
@@ -183,7 +182,7 @@ static void BM_AcquireMutex(benchmark::State& state) {
     DoNothing(NULL, GRPC_ERROR_NONE);
     gpr_mu_unlock(&mu);
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_AcquireMutex);
@@ -202,7 +201,7 @@ static void BM_TryAcquireMutex(benchmark::State& state) {
       abort();
     }
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_TryAcquireMutex);
@@ -217,7 +216,7 @@ static void BM_AcquireSpinlock(benchmark::State& state) {
     DoNothing(NULL, GRPC_ERROR_NONE);
     gpr_spinlock_unlock(&mu);
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_AcquireSpinlock);
@@ -235,7 +234,7 @@ static void BM_TryAcquireSpinlock(benchmark::State& state) {
       abort();
     }
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_TryAcquireSpinlock);
@@ -248,10 +247,10 @@ static void BM_ClosureSchedOnCombiner(benchmark::State& state) {
   ExecCtx _local_exec_ctx;
   while (state.KeepRunning()) {
     GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   GRPC_COMBINER_UNREF(combiner, "finished");
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureSchedOnCombiner);
@@ -267,10 +266,10 @@ static void BM_ClosureSched2OnCombiner(benchmark::State& state) {
   while (state.KeepRunning()) {
     GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE);
     GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   GRPC_COMBINER_UNREF(combiner, "finished");
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureSched2OnCombiner);
@@ -289,10 +288,10 @@ static void BM_ClosureSched3OnCombiner(benchmark::State& state) {
     GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE);
     GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE);
     GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   GRPC_COMBINER_UNREF(combiner, "finished");
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureSched3OnCombiner);
@@ -309,11 +308,11 @@ static void BM_ClosureSched2OnTwoCombiners(benchmark::State& state) {
   while (state.KeepRunning()) {
     GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE);
     GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   GRPC_COMBINER_UNREF(combiner1, "finished");
   GRPC_COMBINER_UNREF(combiner2, "finished");
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureSched2OnTwoCombiners);
@@ -336,11 +335,11 @@ static void BM_ClosureSched4OnTwoCombiners(benchmark::State& state) {
     GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE);
     GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE);
     GRPC_CLOSURE_SCHED(&c4, GRPC_ERROR_NONE);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   GRPC_COMBINER_UNREF(combiner1, "finished");
   GRPC_COMBINER_UNREF(combiner2, "finished");
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureSched4OnTwoCombiners);
@@ -379,7 +378,7 @@ static void BM_ClosureReschedOnExecCtx(benchmark::State& state) {
   ExecCtx _local_exec_ctx;
   Rescheduler r(state, grpc_schedule_on_exec_ctx);
   r.ScheduleFirst();
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureReschedOnExecCtx);
@@ -390,9 +389,9 @@ static void BM_ClosureReschedOnCombiner(benchmark::State& state) {
   grpc_combiner* combiner = grpc_combiner_create();
   Rescheduler r(state, grpc_combiner_scheduler(combiner));
   r.ScheduleFirst();
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   GRPC_COMBINER_UNREF(combiner, "finished");
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureReschedOnCombiner);
@@ -403,9 +402,9 @@ static void BM_ClosureReschedOnCombinerFinally(benchmark::State& state) {
   grpc_combiner* combiner = grpc_combiner_create();
   Rescheduler r(state, grpc_combiner_finally_scheduler(combiner));
   r.ScheduleFirstAgainstDifferentScheduler(grpc_combiner_scheduler(combiner));
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   GRPC_COMBINER_UNREF(combiner, "finished");
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_ClosureReschedOnCombinerFinally);
diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc
index 6d36e61cff..9fb603213a 100644
--- a/test/cpp/microbenchmarks/bm_cq.cc
+++ b/test/cpp/microbenchmarks/bm_cq.cc
@@ -84,7 +84,7 @@ static void BM_Pass1Cpp(benchmark::State& state) {
     GPR_ASSERT(grpc_cq_begin_op(c_cq, &dummy_tag));
     grpc_cq_end_op(c_cq, &dummy_tag, GRPC_ERROR_NONE, DoneWithCompletionOnStack,
                    NULL, &completion);
-    grpc_exec_ctx_finish();
+
     void* tag;
     bool ok;
     cq.Next(&tag, &ok);
@@ -104,7 +104,7 @@ static void BM_Pass1Core(benchmark::State& state) {
     GPR_ASSERT(grpc_cq_begin_op(cq, NULL));
     grpc_cq_end_op(cq, NULL, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL,
                    &completion);
-    grpc_exec_ctx_finish();
+
     grpc_completion_queue_next(cq, deadline, NULL);
   }
   grpc_completion_queue_destroy(cq);
@@ -123,7 +123,7 @@ static void BM_Pluck1Core(benchmark::State& state) {
     GPR_ASSERT(grpc_cq_begin_op(cq, NULL));
     grpc_cq_end_op(cq, NULL, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL,
                    &completion);
-    grpc_exec_ctx_finish();
+
     grpc_completion_queue_pluck(cq, NULL, deadline, NULL);
   }
   grpc_completion_queue_destroy(cq);
diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
index 41e616a6ef..0cd9a2c361 100644
--- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
+++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
@@ -76,7 +76,7 @@ static grpc_error* pollset_work(grpc_pollset* ps, grpc_pollset_worker** worker,
   GPR_ASSERT(grpc_cq_begin_op(g_cq, g_tag));
   grpc_cq_end_op(g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, NULL,
                  (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion)));
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   gpr_mu_lock(&ps->mu);
   return GRPC_ERROR_NONE;
 }
diff --git a/test/cpp/microbenchmarks/bm_error.cc b/test/cpp/microbenchmarks/bm_error.cc
index 3f85e351f5..8dc98ab923 100644
--- a/test/cpp/microbenchmarks/bm_error.cc
+++ b/test/cpp/microbenchmarks/bm_error.cc
@@ -253,7 +253,7 @@ static void BM_ErrorGetStatus(benchmark::State& state) {
     grpc_error_get_status(fixture.error(), fixture.deadline(), &status, &slice,
                           NULL);
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 
@@ -267,7 +267,7 @@ static void BM_ErrorGetStatusCode(benchmark::State& state) {
     grpc_error_get_status(fixture.error(), fixture.deadline(), &status, NULL,
                           NULL);
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 
@@ -281,7 +281,7 @@ static void BM_ErrorHttpError(benchmark::State& state) {
     grpc_error_get_status(fixture.error(), fixture.deadline(), NULL, NULL,
                           &error);
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 
diff --git a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc
index 74e99982ce..191c93c58d 100644
--- a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc
+++ b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc
@@ -183,7 +183,7 @@ class TrickledCHTTP2 : public EndpointPairFixture {
         grpc_trickle_endpoint_trickle(endpoint_pair_.client);
     size_t server_backlog =
         grpc_trickle_endpoint_trickle(endpoint_pair_.server);
-    grpc_exec_ctx_finish();
+
     if (update_stats) {
       UpdateStats((grpc_chttp2_transport*)client_transport_, &client_stats_,
                   client_backlog);
diff --git a/test/cpp/microbenchmarks/bm_metadata.cc b/test/cpp/microbenchmarks/bm_metadata.cc
index 5d89e0d3c6..07fcf6af99 100644
--- a/test/cpp/microbenchmarks/bm_metadata.cc
+++ b/test/cpp/microbenchmarks/bm_metadata.cc
@@ -94,7 +94,7 @@ static void BM_MetadataFromNonInternedSlices(benchmark::State& state) {
   while (state.KeepRunning()) {
     GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL));
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_MetadataFromNonInternedSlices);
@@ -107,7 +107,7 @@ static void BM_MetadataFromInternedSlices(benchmark::State& state) {
   while (state.KeepRunning()) {
     GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL));
   }
-  grpc_exec_ctx_finish();
+
   grpc_slice_unref(k);
   grpc_slice_unref(v);
   track_counters.Finish(state);
@@ -125,7 +125,7 @@ static void BM_MetadataFromInternedSlicesAlreadyInIndex(
     GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL));
   }
   GRPC_MDELEM_UNREF(seed);
-  grpc_exec_ctx_finish();
+
   grpc_slice_unref(k);
   grpc_slice_unref(v);
   track_counters.Finish(state);
@@ -140,7 +140,7 @@ static void BM_MetadataFromInternedKey(benchmark::State& state) {
   while (state.KeepRunning()) {
     GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL));
   }
-  grpc_exec_ctx_finish();
+
   grpc_slice_unref(k);
   track_counters.Finish(state);
 }
@@ -157,7 +157,7 @@ static void BM_MetadataFromNonInternedSlicesWithBackingStore(
     GRPC_MDELEM_UNREF(grpc_mdelem_create(
         k, v, reinterpret_cast<grpc_mdelem_data*>(backing_store)));
   }
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_MetadataFromNonInternedSlicesWithBackingStore);
@@ -173,7 +173,7 @@ static void BM_MetadataFromInternedSlicesWithBackingStore(
     GRPC_MDELEM_UNREF(grpc_mdelem_create(
         k, v, reinterpret_cast<grpc_mdelem_data*>(backing_store)));
   }
-  grpc_exec_ctx_finish();
+
   grpc_slice_unref(k);
   grpc_slice_unref(v);
   track_counters.Finish(state);
@@ -191,7 +191,7 @@ static void BM_MetadataFromInternedKeyWithBackingStore(
     GRPC_MDELEM_UNREF(grpc_mdelem_create(
         k, v, reinterpret_cast<grpc_mdelem_data*>(backing_store)));
   }
-  grpc_exec_ctx_finish();
+
   grpc_slice_unref(k);
   track_counters.Finish(state);
 }
@@ -205,7 +205,7 @@ static void BM_MetadataFromStaticMetadataStrings(benchmark::State& state) {
   while (state.KeepRunning()) {
     GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL));
   }
-  grpc_exec_ctx_finish();
+
   grpc_slice_unref(k);
   track_counters.Finish(state);
 }
@@ -220,7 +220,7 @@ static void BM_MetadataFromStaticMetadataStringsNotIndexed(
   while (state.KeepRunning()) {
     GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL));
   }
-  grpc_exec_ctx_finish();
+
   grpc_slice_unref(k);
   track_counters.Finish(state);
 }
@@ -237,7 +237,7 @@ static void BM_MetadataRefUnrefExternal(benchmark::State& state) {
     GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el));
   }
   GRPC_MDELEM_UNREF(el);
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_MetadataRefUnrefExternal);
@@ -256,7 +256,7 @@ static void BM_MetadataRefUnrefInterned(benchmark::State& state) {
     GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el));
   }
   GRPC_MDELEM_UNREF(el);
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_MetadataRefUnrefInterned);
@@ -270,7 +270,7 @@ static void BM_MetadataRefUnrefAllocated(benchmark::State& state) {
     GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el));
   }
   GRPC_MDELEM_UNREF(el);
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_MetadataRefUnrefAllocated);
@@ -283,7 +283,7 @@ static void BM_MetadataRefUnrefStatic(benchmark::State& state) {
     GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el));
   }
   GRPC_MDELEM_UNREF(el);
-  grpc_exec_ctx_finish();
+
   track_counters.Finish(state);
 }
 BENCHMARK(BM_MetadataRefUnrefStatic);
diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc
index 3da8e16788..7ddca45eca 100644
--- a/test/cpp/microbenchmarks/bm_pollset.cc
+++ b/test/cpp/microbenchmarks/bm_pollset.cc
@@ -60,9 +60,9 @@ static void BM_CreateDestroyPollset(benchmark::State& state) {
     gpr_mu_lock(mu);
     grpc_pollset_shutdown(ps, &shutdown_ps_closure);
     gpr_mu_unlock(mu);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
-  grpc_exec_ctx_finish();
+
   gpr_free(ps);
   track_counters.Finish(state);
 }
@@ -124,7 +124,7 @@ static void BM_PollEmptyPollset(benchmark::State& state) {
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(ps, &shutdown_ps_closure);
   gpr_mu_unlock(mu);
-  grpc_exec_ctx_finish();
+
   gpr_free(ps);
   track_counters.Finish(state);
 }
@@ -143,7 +143,7 @@ static void BM_PollAddFd(benchmark::State& state) {
   grpc_fd* fd = grpc_fd_create(wakeup_fd.read_fd, "xxx");
   while (state.KeepRunning()) {
     grpc_pollset_add_fd(ps, fd);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   grpc_fd_orphan(fd, NULL, NULL, false /* already_closed */, "xxx");
   grpc_closure shutdown_ps_closure;
@@ -152,7 +152,7 @@ static void BM_PollAddFd(benchmark::State& state) {
   gpr_mu_lock(mu);
   grpc_pollset_shutdown(ps, &shutdown_ps_closure);
   gpr_mu_unlock(mu);
-  grpc_exec_ctx_finish();
+
   gpr_free(ps);
   track_counters.Finish(state);
 }
@@ -248,7 +248,7 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) {
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(ps, &shutdown_ps_closure);
   gpr_mu_unlock(mu);
-  grpc_exec_ctx_finish();
+
   grpc_wakeup_fd_destroy(&wakeup_fd);
   gpr_free(ps);
   track_counters.Finish(state);
diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h
index 24b74b9d37..075064eca7 100644
--- a/test/cpp/microbenchmarks/fullstack_fixtures.h
+++ b/test/cpp/microbenchmarks/fullstack_fixtures.h
@@ -205,8 +205,6 @@ class EndpointPairFixture : public BaseFixture {
 
       channel_ = CreateChannelInternal("", channel);
     }
-
-    grpc_exec_ctx_finish();
   }
 
   virtual ~EndpointPairFixture() {
diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc
index 836cc676c2..8ba8be0ea4 100644
--- a/test/cpp/naming/resolver_component_test.cc
+++ b/test/cpp/naming/resolver_component_test.cc
@@ -171,7 +171,7 @@ void ArgsFinish(ArgsStruct* args) {
   grpc_pollset_shutdown(args->pollset, &DoNothing_cb);
   // exec_ctx needs to be flushed before calling grpc_pollset_destroy()
   grpc_channel_args_destroy(args->channel_args);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   grpc_pollset_destroy(args->pollset);
   gpr_free(args->pollset);
   GRPC_COMBINER_UNREF(args->lock, NULL);
@@ -202,7 +202,6 @@ void PollPollsetUntilRequestDone(ArgsStruct* args) {
                                         grpc_timespec_to_millis_round_up(
                                             NSecondDeadline(1))));
     gpr_mu_unlock(args->mu);
-    grpc_exec_ctx_finish();
   }
   gpr_event_set(&args->ev, (void*)1);
 }
@@ -295,11 +294,10 @@ TEST(ResolverComponentTest, TestResolvesRelevantRecords) {
                     (void*)&args, grpc_combiner_scheduler(args.lock));
   grpc_resolver_next_locked(resolver, &args.channel_args,
                             &on_resolver_result_changed);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   PollPollsetUntilRequestDone(&args);
   GRPC_RESOLVER_UNREF(resolver, NULL);
   ArgsFinish(&args);
-  grpc_exec_ctx_finish();
 }
 
 }  // namespace
diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc
index b05da25e1d..b9514e6306 100644
--- a/test/cpp/performance/writes_per_rpc_test.cc
+++ b/test/cpp/performance/writes_per_rpc_test.cc
@@ -120,8 +120,6 @@ class EndpointPairFixture {
 
       channel_ = CreateChannelInternal("", channel);
     }
-
-    grpc_exec_ctx_finish();
   }
 
   virtual ~EndpointPairFixture() {