Address some PR comments

10 files changed, 16 insertions, 36 deletions

diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc
index ca29b82616..4d41ece875 100644
--- a/test/core/transport/bdp_estimator_test.cc
+++ b/test/core/transport/bdp_estimator_test.cc
@@ -66,9 +66,8 @@ void AddSamples(BdpEstimator* estimator, int64_t* samples, size_t n) {
   }
   gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME),
                                gpr_time_from_millis(1, GPR_TIMESPAN)));
-  grpc_exec_ctx_invalidate_now();
+  ExecCtx::Get()->InvalidateNow();
   estimator->CompletePing();
-  grpc_exec_ctx_finish();
 }
 
 void AddSample(BdpEstimator* estimator, int64_t sample) {
diff --git a/test/core/transport/byte_stream_test.cc b/test/core/transport/byte_stream_test.cc
index af6abaeeed..12a933f332 100644
--- a/test/core/transport/byte_stream_test.cc
+++ b/test/core/transport/byte_stream_test.cc
@@ -66,7 +66,6 @@ static void test_slice_buffer_stream_basic(void) {
   // Clean up.
   grpc_byte_stream_destroy(&stream.base);
   grpc_slice_buffer_destroy_internal(&buffer);
-  grpc_exec_ctx_finish();
 }
 
 static void test_slice_buffer_stream_shutdown(void) {
@@ -109,7 +108,6 @@ static void test_slice_buffer_stream_shutdown(void) {
   // Clean up.
   grpc_byte_stream_destroy(&stream.base);
   grpc_slice_buffer_destroy_internal(&buffer);
-  grpc_exec_ctx_finish();
 }
 
 //
@@ -153,7 +151,6 @@ static void test_caching_byte_stream_basic(void) {
   grpc_byte_stream_destroy(&stream.base);
   grpc_byte_stream_cache_destroy(&cache);
   grpc_slice_buffer_destroy_internal(&buffer);
-  grpc_exec_ctx_finish();
 }
 
 static void test_caching_byte_stream_reset(void) {
@@ -200,7 +197,6 @@ static void test_caching_byte_stream_reset(void) {
   grpc_byte_stream_destroy(&stream.base);
   grpc_byte_stream_cache_destroy(&cache);
   grpc_slice_buffer_destroy_internal(&buffer);
-  grpc_exec_ctx_finish();
 }
 
 static void test_caching_byte_stream_shared_cache(void) {
@@ -254,7 +250,6 @@ static void test_caching_byte_stream_shared_cache(void) {
   grpc_byte_stream_destroy(&stream2.base);
   grpc_byte_stream_cache_destroy(&cache);
   grpc_slice_buffer_destroy_internal(&buffer);
-  grpc_exec_ctx_finish();
 }
 
 int main(int argc, char** argv) {
diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc
index 663ccf189b..3d463c40a5 100644
--- a/test/core/transport/chttp2/bin_decoder_test.cc
+++ b/test/core/transport/chttp2/bin_decoder_test.cc
@@ -129,7 +129,5 @@ int main(int argc, char** argv) {
   EXPECT_SLICE_EQ("", base64_decode_with_length("Zm:v", 3));
   EXPECT_SLICE_EQ("", base64_decode_with_length("Zm=v", 3));
 
-  grpc_exec_ctx_finish();
-
   return all_ok ? 0 : 1;
 }
diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc
index e1bfcc5b37..fe4538339e 100644
--- a/test/core/transport/chttp2/hpack_encoder_test.cc
+++ b/test/core/transport/chttp2/hpack_encoder_test.cc
@@ -261,7 +261,6 @@ static void run_test(void (*test)(), const char* name) {
   grpc_chttp2_hpack_compressor_init(&g_compressor);
   test();
   grpc_chttp2_hpack_compressor_destroy(&g_compressor);
-  grpc_exec_ctx_finish();
 }
 
 int main(int argc, char** argv) {
diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc
index d2199ca706..feb27fc0ff 100644
--- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc
+++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc
@@ -43,7 +43,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse(
       &parser, grpc_slice_from_static_buffer(data, size)));
   grpc_chttp2_hpack_parser_destroy(&parser);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
   return 0;
 }
diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc
index 0a3cbf84ad..69a13108f9 100644
--- a/test/core/transport/chttp2/hpack_parser_test.cc
+++ b/test/core/transport/chttp2/hpack_parser_test.cc
@@ -65,7 +65,6 @@ static void test_vector(grpc_chttp2_hpack_parser* parser,
     ExecCtx _local_exec_ctx;
     GPR_ASSERT(grpc_chttp2_hpack_parser_parse(parser, slices[i]) ==
                GRPC_ERROR_NONE);
-    grpc_exec_ctx_finish();
   }
 
   for (i = 0; i < nslices; i++) {
@@ -204,8 +203,6 @@ static void test_vectors(grpc_slice_split_mode mode) {
               "set-cookie",
               "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL);
   grpc_chttp2_hpack_parser_destroy(&parser);
-
-  grpc_exec_ctx_finish();
 }
 
 int main(int argc, char** argv) {
diff --git a/test/core/transport/chttp2/hpack_table_test.cc b/test/core/transport/chttp2/hpack_table_test.cc
index 68682f1991..fd5604d857 100644
--- a/test/core/transport/chttp2/hpack_table_test.cc
+++ b/test/core/transport/chttp2/hpack_table_test.cc
@@ -113,7 +113,6 @@ static void test_static_lookup(void) {
   assert_index(&tbl, 61, "www-authenticate", "");
 
   grpc_chttp2_hptbl_destroy(&tbl);
-  grpc_exec_ctx_finish();
 }
 
 static void test_many_additions(void) {
@@ -148,7 +147,6 @@ static void test_many_additions(void) {
   }
 
   grpc_chttp2_hptbl_destroy(&tbl);
-  grpc_exec_ctx_finish();
 }
 
 static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl* tbl,
@@ -159,7 +157,7 @@ static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl* tbl,
       grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value));
   grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find(tbl, md);
   GRPC_MDELEM_UNREF(md);
-  grpc_exec_ctx_finish();
+
   return r;
 }
 
@@ -266,7 +264,6 @@ static void test_find(void) {
   GPR_ASSERT(r.has_value == 0);
 
   grpc_chttp2_hptbl_destroy(&tbl);
-  grpc_exec_ctx_finish();
 }
 
 int main(int argc, char** argv) {
diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc
index 92bf1ba903..8ddd8bb2df 100644
--- a/test/core/transport/connectivity_state_test.cc
+++ b/test/core/transport/connectivity_state_test.cc
@@ -66,7 +66,6 @@ static void test_check(void) {
   GPR_ASSERT(grpc_connectivity_state_check(&tracker) == GRPC_CHANNEL_IDLE);
   GPR_ASSERT(error == GRPC_ERROR_NONE);
   grpc_connectivity_state_destroy(&tracker);
-  grpc_exec_ctx_finish();
 }
 
 static void test_subscribe_then_unsubscribe(void) {
@@ -80,16 +79,15 @@ static void test_subscribe_then_unsubscribe(void) {
   grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx");
   GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state,
                                                             closure));
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   GPR_ASSERT(state == GRPC_CHANNEL_IDLE);
   GPR_ASSERT(g_counter == 0);
   grpc_connectivity_state_notify_on_state_change(&tracker, NULL, closure);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   GPR_ASSERT(state == GRPC_CHANNEL_IDLE);
   GPR_ASSERT(g_counter == 1);
 
   grpc_connectivity_state_destroy(&tracker);
-  grpc_exec_ctx_finish();
 }
 
 static void test_subscribe_then_destroy(void) {
@@ -103,11 +101,11 @@ static void test_subscribe_then_destroy(void) {
   grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx");
   GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state,
                                                             closure));
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   GPR_ASSERT(state == GRPC_CHANNEL_IDLE);
   GPR_ASSERT(g_counter == 0);
   grpc_connectivity_state_destroy(&tracker);
-  grpc_exec_ctx_finish();
+
   GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN);
   GPR_ASSERT(g_counter == 1);
 }
@@ -123,11 +121,11 @@ static void test_subscribe_with_failure_then_destroy(void) {
   grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_SHUTDOWN, "xxx");
   GPR_ASSERT(0 == grpc_connectivity_state_notify_on_state_change(
                       &tracker, &state, closure));
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN);
   GPR_ASSERT(g_counter == 0);
   grpc_connectivity_state_destroy(&tracker);
-  grpc_exec_ctx_finish();
+
   GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN);
   GPR_ASSERT(g_counter == 1);
 }
diff --git a/test/core/transport/metadata_test.cc b/test/core/transport/metadata_test.cc
index 4bc5672958..3d7034e4ce 100644
--- a/test/core/transport/metadata_test.cc
+++ b/test/core/transport/metadata_test.cc
@@ -80,7 +80,7 @@ static void test_create_metadata(bool intern_keys, bool intern_values) {
   GRPC_MDELEM_UNREF(m1);
   GRPC_MDELEM_UNREF(m2);
   GRPC_MDELEM_UNREF(m3);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
 }
 
@@ -103,7 +103,7 @@ static void test_create_many_ephemeral_metadata(bool intern_keys,
         maybe_intern(grpc_slice_from_static_string("a"), intern_keys),
         maybe_intern(grpc_slice_from_copied_string(buffer), intern_values)));
   }
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
 }
 
@@ -138,7 +138,7 @@ static void test_create_many_persistant_metadata(void) {
   for (i = 0; i < MANY; i++) {
     GRPC_MDELEM_UNREF(created[i]);
   }
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
 
   gpr_free(created);
@@ -169,7 +169,7 @@ static void test_spin_creating_the_same_thing(bool intern_keys,
     GPR_ASSERT(a.payload == b.payload);
     GPR_ASSERT(a.payload == c.payload);
   }
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
 }
 
@@ -209,7 +209,7 @@ static void test_identity_laws(bool intern_keys, bool intern_values) {
   GRPC_MDELEM_UNREF(a);
   GRPC_MDELEM_UNREF(b);
   GRPC_MDELEM_UNREF(c);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
 }
 
@@ -259,7 +259,6 @@ static void test_things_stick_around(void) {
     }
   }
 
-  grpc_exec_ctx_finish();
   grpc_shutdown();
   gpr_free(strs);
   gpr_free(shuf);
@@ -284,7 +283,7 @@ static void test_user_data_works(void) {
   grpc_mdelem_set_user_data(md, gpr_free, ud2);
   GPR_ASSERT(grpc_mdelem_get_user_data(md, gpr_free) == ud1);
   GRPC_MDELEM_UNREF(md);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
 }
 
@@ -340,7 +339,6 @@ static void test_mdelem_sizes_in_hpack(bool intern_key, bool intern_value) {
                               intern_value);
   }
 
-  grpc_exec_ctx_finish();
   grpc_shutdown();
 }
 
@@ -366,7 +364,6 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) {
     GRPC_MDELEM_UNREF(q);
   }
 
-  grpc_exec_ctx_finish();
   grpc_shutdown();
 }
 
diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc
index 44e961310a..16ecd076a3 100644
--- a/test/core/transport/status_conversion_test.cc
+++ b/test/core/transport/status_conversion_test.cc
@@ -26,7 +26,7 @@
   do {                                                               \
     ExecCtx _local_exec_ctx;                                         \
     GPR_ASSERT(grpc_http2_error_to_grpc_status(a, deadline) == (b)); \
-    grpc_exec_ctx_finish();                                          \
+                                                                     \
   } while (0)
 #define GRPC_STATUS_TO_HTTP2_STATUS(a, b) \
   GPR_ASSERT(grpc_status_to_http2_status(a) == (b))