9 files changed, 21 insertions, 21 deletions
diff --git a/src/core/surface/call.c b/src/core/surface/call.c
index de47bc3808..e7fbab7b5b 100644
--- a/src/core/surface/call.c
+++ b/src/core/surface/call.c
@@ -404,7 +404,7 @@ grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 pr
     {
       set_deadline_alarm (call, send_deadline, &closure_list);
     }
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return call;
 }
 
@@ -1426,7 +1426,7 @@ grpc_call_destroy (grpc_call * c)
   if (cancel)
     grpc_call_cancel (c, NULL);
   GRPC_CALL_INTERNAL_UNREF (c, "destroy", &closure_list);
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
 }
 
 grpc_call_error
@@ -1445,7 +1445,7 @@ grpc_call_cancel_with_status (grpc_call * c, grpc_status_code status, const char
   lock (c);
   r = cancel_with_status (c, status, description);
   unlock (c, &closure_list);
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return r;
 }
 
@@ -1517,7 +1517,7 @@ grpc_call_get_peer (grpc_call * call)
   grpc_call_element *elem = CALL_ELEM_FROM_CALL (call, 0);
   grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
   char *result = elem->filter->get_peer (elem, &closure_list);
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return result;
 }
 
@@ -1994,7 +1994,7 @@ grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void
 
   error = grpc_call_start_ioreq_and_call_back (call, reqs, out, finish_func, tag, &closure_list);
 done:
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return error;
 }
 
diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c
index 2d120cf807..376c4adfad 100644
--- a/src/core/surface/channel.c
+++ b/src/core/surface/channel.c
@@ -326,7 +326,7 @@ grpc_channel_destroy (grpc_channel * channel)
 
   GRPC_CHANNEL_INTERNAL_UNREF (channel, "channel", &closure_list);
 
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
 }
 
 grpc_channel_stack *
diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c
index b72be303d1..c021ea3db0 100644
--- a/src/core/surface/channel_connectivity.c
+++ b/src/core/surface/channel_connectivity.c
@@ -53,7 +53,7 @@ grpc_channel_check_connectivity_state (grpc_channel * channel, int try_to_connec
       return GRPC_CHANNEL_FATAL_FAILURE;
     }
   state = grpc_client_channel_check_connectivity_state (client_channel_elem, try_to_connect, &closure_list);
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return state;
 }
 
@@ -209,5 +209,5 @@ grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity
       grpc_client_channel_watch_connectivity_state (client_channel_elem, &w->state, &w->on_complete, &closure_list);
     }
 
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
 }
diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c
index 2f597563ab..2fc2b39f5f 100644
--- a/src/core/surface/channel_create.c
+++ b/src/core/surface/channel_create.c
@@ -228,7 +228,7 @@ grpc_insecure_channel_create (const char *target, const grpc_channel_args * args
   GRPC_RESOLVER_UNREF (resolver, "create", &closure_list);
   grpc_subchannel_factory_unref (&f->base, &closure_list);
 
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
 
   return channel;
 }
diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c
index 5cc07261bf..2740691d18 100644
--- a/src/core/surface/completion_queue.c
+++ b/src/core/surface/completion_queue.c
@@ -237,7 +237,7 @@ grpc_completion_queue_next (grpc_completion_queue * cc, gpr_timespec deadline, v
     }
   GRPC_SURFACE_TRACE_RETURNED_EVENT (cc, &ret);
   GRPC_CQ_INTERNAL_UNREF (cc, "next");
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return ret;
 }
 
@@ -341,7 +341,7 @@ grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec
 done:
   GRPC_SURFACE_TRACE_RETURNED_EVENT (cc, &ret);
   GRPC_CQ_INTERNAL_UNREF (cc, "pluck");
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return ret;
 }
 
@@ -368,7 +368,7 @@ grpc_completion_queue_shutdown (grpc_completion_queue * cc)
       gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset));
       grpc_pollset_shutdown (&cc->pollset, &cc->pollset_destroy_done, &closure_list);
     }
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
 }
 
 void
diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c
index e2a8e191ad..e1d4657ebf 100644
--- a/src/core/surface/lame_client.c
+++ b/src/core/surface/lame_client.c
@@ -171,6 +171,6 @@ grpc_lame_client_channel_create (const char *target, grpc_status_code error_code
   chand = (channel_data *) elem->channel_data;
   chand->error_code = error_code;
   chand->error_message = error_message;
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return channel;
 }
diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c
index 1290308992..7187bbf198 100644
--- a/src/core/surface/secure_channel_create.c
+++ b/src/core/surface/secure_channel_create.c
@@ -313,7 +313,7 @@ grpc_secure_channel_create (grpc_credentials * creds, const char *target, const
       grpc_channel_args_destroy (new_args_from_connector);
     }
 
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
 
   return channel;
 }
diff --git a/src/core/surface/server.c b/src/core/surface/server.c
index 0b05720fa7..940050e9d9 100644
--- a/src/core/surface/server.c
+++ b/src/core/surface/server.c
@@ -994,7 +994,7 @@ grpc_server_start (grpc_server * server)
       l->start (server, l->arg, server->pollsets, server->cq_count, &closure_list);
     }
 
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
 }
 
 void
@@ -1161,7 +1161,7 @@ grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * c
   channel_broadcaster_shutdown (&broadcaster, 1, 0, &closure_list);
 
 done:
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
 }
 
 void
@@ -1175,7 +1175,7 @@ grpc_server_cancel_all_calls (grpc_server * server)
   gpr_mu_unlock (&server->mu_global);
 
   channel_broadcaster_shutdown (&broadcaster, 0, 1, &closure_list);
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
 }
 
 void
@@ -1198,7 +1198,7 @@ grpc_server_destroy (grpc_server * server)
   gpr_mu_unlock (&server->mu_global);
 
   server_unref (server, &closure_list);
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
 }
 
 void
@@ -1299,7 +1299,7 @@ grpc_server_request_call (grpc_server * server, grpc_call ** call, grpc_call_det
   rc->data.batch.initial_metadata = initial_metadata;
   error = queue_call_request (server, rc, &closure_list);
 done:
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return error;
 }
 
@@ -1329,7 +1329,7 @@ grpc_server_request_registered_call (grpc_server * server, void *rm, grpc_call *
   rc->data.registered.optional_payload = optional_payload;
   error = queue_call_request (server, rc, &closure_list);
 done:
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return error;
 }
 
diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c
index 438ac385b4..c7e7849ed2 100644
--- a/src/core/surface/server_chttp2.c
+++ b/src/core/surface/server_chttp2.c
@@ -151,6 +151,6 @@ error:
   port_num = 0;
 
 done:
-  grpc_closure_list_run (&closure_list);
+  grpc_exec_ctx_finish (&exec_ctx);
   return port_num;
 }