Move argument passing to start of list

6 files changed, 38 insertions, 38 deletions

diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c
index 2a50935c97..b34feabfe5 100644
--- a/test/core/security/credentials_test.c
+++ b/test/core/security/credentials_test.c
@@ -308,7 +308,7 @@ test_google_iam_creds (void)
 								NULL);
   GPR_ASSERT (grpc_credentials_has_request_metadata (creds));
   GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds));
-  grpc_credentials_get_request_metadata (creds, NULL, test_service_url, check_google_iam_metadata, creds, &closure_list);
+  grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, check_google_iam_metadata, creds);
   grpc_exec_ctx_finish (&exec_ctx);
 }
 
@@ -331,7 +331,7 @@ test_access_token_creds (void)
   GPR_ASSERT (grpc_credentials_has_request_metadata (creds));
   GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds));
   GPR_ASSERT (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0);
-  grpc_credentials_get_request_metadata (creds, NULL, test_service_url, check_access_token_metadata, creds, &closure_list);
+  grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, check_access_token_metadata, creds);
   grpc_exec_ctx_finish (&exec_ctx);
 }
 
@@ -365,7 +365,7 @@ test_ssl_oauth2_composite_creds (void)
   GPR_ASSERT (creds_array->num_creds == 2);
   GPR_ASSERT (strcmp (creds_array->creds_array[0]->type, GRPC_CREDENTIALS_TYPE_SSL) == 0);
   GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0);
-  grpc_credentials_get_request_metadata (composite_creds, NULL, test_service_url, check_ssl_oauth2_composite_metadata, composite_creds, &closure_list);
+  grpc_credentials_get_request_metadata (&exec_ctx, composite_creds, NULL, test_service_url, check_ssl_oauth2_composite_metadata, composite_creds);
   grpc_exec_ctx_finish (&exec_ctx);
 }
 
@@ -421,7 +421,7 @@ test_ssl_oauth2_google_iam_composite_creds (void)
   GPR_ASSERT (strcmp (creds_array->creds_array[0]->type, GRPC_CREDENTIALS_TYPE_SSL) == 0);
   GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0);
   GPR_ASSERT (strcmp (creds_array->creds_array[2]->type, GRPC_CREDENTIALS_TYPE_IAM) == 0);
-  grpc_credentials_get_request_metadata (composite_creds, NULL, test_service_url, check_ssl_oauth2_google_iam_composite_metadata, composite_creds, &closure_list);
+  grpc_credentials_get_request_metadata (&exec_ctx, composite_creds, NULL, test_service_url, check_ssl_oauth2_google_iam_composite_metadata, composite_creds);
   grpc_exec_ctx_finish (&exec_ctx);
 }
 
@@ -498,12 +498,12 @@ test_compute_engine_creds_success (void)
 
   /* First request: http get should be called. */
   grpc_httpcli_set_override (compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called);
-  grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list);
+  grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data);
   grpc_exec_ctx_finish (&exec_ctx);
 
   /* Second request: the cached token should be served directly. */
   grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called);
-  grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list);
+  grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data);
   grpc_exec_ctx_finish (&exec_ctx);
 
   grpc_credentials_unref (compute_engine_creds);
@@ -518,7 +518,7 @@ test_compute_engine_creds_failure (void)
   grpc_httpcli_set_override (compute_engine_httpcli_get_failure_override, httpcli_post_should_not_be_called);
   GPR_ASSERT (grpc_credentials_has_request_metadata (compute_engine_creds));
   GPR_ASSERT (grpc_credentials_has_request_metadata_only (compute_engine_creds));
-  grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (void *) test_user_data, &closure_list);
+  grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (&exec_ctx, void *) test_user_data);
   grpc_credentials_unref (compute_engine_creds);
   grpc_httpcli_set_override (NULL, NULL);
   grpc_exec_ctx_finish (&exec_ctx);
@@ -572,12 +572,12 @@ test_refresh_token_creds_success (void)
 
   /* First request: http get should be called. */
   grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_success);
-  grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list);
+  grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data);
   grpc_exec_ctx_finish (&exec_ctx);
 
   /* Second request: the cached token should be served directly. */
   grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called);
-  grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list);
+  grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (&exec_ctx, void *) test_user_data);
   grpc_exec_ctx_finish (&exec_ctx);
 
   grpc_credentials_unref (refresh_token_creds);
@@ -594,7 +594,7 @@ test_refresh_token_creds_failure (void)
   grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_failure);
   GPR_ASSERT (grpc_credentials_has_request_metadata (refresh_token_creds));
   GPR_ASSERT (grpc_credentials_has_request_metadata_only (refresh_token_creds));
-  grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (void *) test_user_data, &closure_list);
+  grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (&exec_ctx, void *) test_user_data);
   grpc_credentials_unref (refresh_token_creds);
   grpc_httpcli_set_override (NULL, NULL);
   grpc_exec_ctx_finish (&exec_ctx);
@@ -669,18 +669,18 @@ test_jwt_creds_success (void)
 
   /* First request: jwt_encode_and_sign should be called. */
   grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success);
-  grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list);
+  grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (&exec_ctx, void *) test_user_data);
   grpc_exec_ctx_finish (&exec_ctx);
 
   /* Second request: the cached token should be served directly. */
   grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_should_not_be_called);
-  grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list);
+  grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (&exec_ctx, void *) test_user_data);
   grpc_exec_ctx_finish (&exec_ctx);
 
   /* Third request: Different service url so jwt_encode_and_sign should be
      called again (no caching). */
   grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success);
-  grpc_credentials_get_request_metadata (jwt_creds, NULL, other_test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list);
+  grpc_credentials_get_request_metadata (jwt_creds, NULL, other_test_service_url, on_jwt_creds_get_metadata_success, (&exec_ctx, void *) test_user_data);
   grpc_exec_ctx_finish (&exec_ctx);
 
   gpr_free (json_key_string);
@@ -698,7 +698,7 @@ test_jwt_creds_signing_failure (void)
   GPR_ASSERT (grpc_credentials_has_request_metadata_only (jwt_creds));
 
   grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_failure);
-  grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_failure, (void *) test_user_data, &closure_list);
+  grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_failure, (&exec_ctx, void *) test_user_data);
 
   gpr_free (json_key_string);
   grpc_credentials_unref (jwt_creds);
@@ -854,7 +854,7 @@ test_metadata_plugin_success (void)
 
   creds = grpc_metadata_credentials_create_from_plugin (plugin, NULL);
   GPR_ASSERT (state == PLUGIN_INITIAL_STATE);
-  grpc_credentials_get_request_metadata (creds, NULL, test_service_url, on_plugin_metadata_received_success, NULL, &closure_list);
+  grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, on_plugin_metadata_received_success, NULL);
   GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE);
   grpc_credentials_release (creds);
   GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE);
@@ -875,7 +875,7 @@ test_metadata_plugin_failure (void)
 
   creds = grpc_metadata_credentials_create_from_plugin (plugin, NULL);
   GPR_ASSERT (state == PLUGIN_INITIAL_STATE);
-  grpc_credentials_get_request_metadata (creds, NULL, test_service_url, on_plugin_metadata_received_failure, NULL, &closure_list);
+  grpc_credentials_get_request_metadata (&exec_ctx, creds, NULL, test_service_url, on_plugin_metadata_received_failure, NULL);
   GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE);
   grpc_credentials_release (creds);
   GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE);
diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c
index 94fa78d2b3..44257468e4 100644
--- a/test/core/security/jwt_verifier_test.c
+++ b/test/core/security/jwt_verifier_test.c
@@ -232,7 +232,7 @@ test_jwt_verifier_google_email_issuer_success (void)
   jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL);
   grpc_auth_json_key_destruct (&key);
   GPR_ASSERT (jwt != NULL);
-  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (void *) expected_user_data, &closure_list);
+  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (&exec_ctx, void *) expected_user_data);
   gpr_free (jwt);
   grpc_jwt_verifier_destroy (verifier);
   grpc_httpcli_set_override (NULL, NULL);
@@ -265,7 +265,7 @@ test_jwt_verifier_custom_email_issuer_success (void)
   jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL);
   grpc_auth_json_key_destruct (&key);
   GPR_ASSERT (jwt != NULL);
-  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (void *) expected_user_data, &closure_list);
+  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (&exec_ctx, void *) expected_user_data);
   gpr_free (jwt);
   grpc_jwt_verifier_destroy (verifier);
   grpc_httpcli_set_override (NULL, NULL);
@@ -311,7 +311,7 @@ test_jwt_verifier_url_issuer_success (void)
   jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL);
   grpc_auth_json_key_destruct (&key);
   GPR_ASSERT (jwt != NULL);
-  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (void *) expected_user_data, &closure_list);
+  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_success, (&exec_ctx, void *) expected_user_data);
   gpr_free (jwt);
   grpc_jwt_verifier_destroy (verifier);
   grpc_httpcli_set_override (NULL, NULL);
@@ -350,7 +350,7 @@ test_jwt_verifier_url_issuer_bad_config (void)
   jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL);
   grpc_auth_json_key_destruct (&key);
   GPR_ASSERT (jwt != NULL);
-  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (void *) expected_user_data, &closure_list);
+  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (&exec_ctx, void *) expected_user_data);
   gpr_free (jwt);
   grpc_jwt_verifier_destroy (verifier);
   grpc_httpcli_set_override (NULL, NULL);
@@ -371,7 +371,7 @@ test_jwt_verifier_bad_json_key (void)
   jwt = grpc_jwt_encode_and_sign (&key, expected_audience, expected_lifetime, NULL);
   grpc_auth_json_key_destruct (&key);
   GPR_ASSERT (jwt != NULL);
-  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (void *) expected_user_data, &closure_list);
+  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (&exec_ctx, void *) expected_user_data);
   gpr_free (jwt);
   grpc_jwt_verifier_destroy (verifier);
   grpc_httpcli_set_override (NULL, NULL);
@@ -419,7 +419,7 @@ test_jwt_verifier_bad_signature (void)
   grpc_auth_json_key_destruct (&key);
   corrupt_jwt_sig (jwt);
   GPR_ASSERT (jwt != NULL);
-  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_bad_signature, (void *) expected_user_data, &closure_list);
+  grpc_jwt_verifier_verify (verifier, NULL, jwt, expected_audience, on_verification_bad_signature, (&exec_ctx, void *) expected_user_data);
   gpr_free (jwt);
   grpc_jwt_verifier_destroy (verifier);
   grpc_httpcli_set_override (NULL, NULL);
@@ -447,7 +447,7 @@ test_jwt_verifier_bad_format (void)
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0);
   grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called);
-  grpc_jwt_verifier_verify (verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, (void *) expected_user_data, &closure_list);
+  grpc_jwt_verifier_verify (verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, (&exec_ctx, void *) expected_user_data);
   grpc_jwt_verifier_destroy (verifier);
   grpc_httpcli_set_override (NULL, NULL);
   grpc_exec_ctx_finish (&exec_ctx);
diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c
index 3b8f3a2b85..d6c17b32c5 100644
--- a/test/core/security/oauth2_utils.c
+++ b/test/core/security/oauth2_utils.c
@@ -92,7 +92,7 @@ grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds)
 
   grpc_closure_init (&do_nothing_closure, do_nothing, NULL);
 
-  grpc_credentials_get_request_metadata (creds, &request.pollset, "", on_oauth2_response, &request, &closure_list);
+  grpc_credentials_get_request_metadata (&exec_ctx, creds, &request.pollset, "", on_oauth2_response, &request);
 
   grpc_exec_ctx_finish (&exec_ctx);
 
@@ -100,11 +100,11 @@ grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds)
   while (!request.is_done)
     {
       grpc_pollset_worker worker;
-      grpc_pollset_work (&request.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list);
+      grpc_pollset_work (&request.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC));
     }
   gpr_mu_unlock (GRPC_POLLSET_MU (&request.pollset));
 
-  grpc_pollset_shutdown (&request.pollset, &do_nothing_closure, &closure_list);
+  grpc_pollset_shutdown (&exec_ctx, &request.pollset, &do_nothing_closure);
   grpc_exec_ctx_finish (&exec_ctx);
   grpc_pollset_destroy (&request.pollset);
   return request.token;
diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c
index 143359fea4..e2bc11bf77 100644
--- a/test/core/security/print_google_default_creds_token.c
+++ b/test/core/security/print_google_default_creds_token.c
@@ -97,13 +97,13 @@ main (int argc, char **argv)
   grpc_pollset_init (&sync.pollset);
   sync.is_done = 0;
 
-  grpc_credentials_get_request_metadata (creds, &sync.pollset, service_url, on_metadata_response, &sync, &closure_list);
+  grpc_credentials_get_request_metadata (&exec_ctx, creds, &sync.pollset, service_url, on_metadata_response, &sync);
 
   gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset));
   while (!sync.is_done)
     {
       grpc_pollset_worker worker;
-      grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list);
+      grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC));
       gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset));
       grpc_exec_ctx_finish (&exec_ctx);
       gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset));
diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c
index 581f671ee9..cd4ecb3d4c 100644
--- a/test/core/security/secure_endpoint_test.c
+++ b/test/core/security/secure_endpoint_test.c
@@ -57,8 +57,8 @@ secure_endpoint_create_fixture_tcp_socketpair (size_t slice_size, gpr_slice * le
   grpc_endpoint_pair tcp;
 
   tcp = grpc_iomgr_create_endpoint_pair ("fixture", slice_size);
-  grpc_endpoint_add_to_pollset (tcp.client, &g_pollset, &closure_list);
-  grpc_endpoint_add_to_pollset (tcp.server, &g_pollset, &closure_list);
+  grpc_endpoint_add_to_pollset (&exec_ctx, tcp.client, &g_pollset);
+  grpc_endpoint_add_to_pollset (&exec_ctx, tcp.server, &g_pollset);
 
   if (leftover_nslices == 0)
     {
@@ -161,16 +161,16 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size)
 
   gpr_slice_buffer_init (&incoming);
   grpc_closure_init (&done_closure, inc_call_ctr, &n);
-  grpc_endpoint_read (f.client_ep, &incoming, &done_closure, &closure_list);
+  grpc_endpoint_read (&exec_ctx, f.client_ep, &incoming, &done_closure);
   grpc_exec_ctx_finish (&exec_ctx);
   GPR_ASSERT (n == 1);
   GPR_ASSERT (incoming.count == 1);
   GPR_ASSERT (0 == gpr_slice_cmp (s, incoming.slices[0]));
 
-  grpc_endpoint_shutdown (f.client_ep, &closure_list);
-  grpc_endpoint_shutdown (f.server_ep, &closure_list);
-  grpc_endpoint_destroy (f.client_ep, &closure_list);
-  grpc_endpoint_destroy (f.server_ep, &closure_list);
+  grpc_endpoint_shutdown (&exec_ctx, f.client_ep);
+  grpc_endpoint_shutdown (&exec_ctx, f.server_ep);
+  grpc_endpoint_destroy (&exec_ctx, f.client_ep);
+  grpc_endpoint_destroy (&exec_ctx, f.server_ep);
   grpc_exec_ctx_finish (&exec_ctx);
   gpr_slice_unref (s);
   gpr_slice_buffer_destroy (&incoming);
@@ -196,7 +196,7 @@ main (int argc, char **argv)
   grpc_endpoint_tests (configs[0], &g_pollset);
   test_leftover (configs[1], 1);
   grpc_closure_init (&destroyed, destroy_pollset, &g_pollset);
-  grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list);
+  grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed);
   grpc_exec_ctx_finish (&exec_ctx);
   grpc_shutdown ();
 
diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c
index 8b35c712cc..cbeda507db 100644
--- a/test/core/security/verify_jwt.c
+++ b/test/core/security/verify_jwt.c
@@ -113,13 +113,13 @@ main (int argc, char **argv)
   grpc_pollset_init (&sync.pollset);
   sync.is_done = 0;
 
-  grpc_jwt_verifier_verify (verifier, &sync.pollset, jwt, aud, on_jwt_verification_done, &sync, &closure_list);
+  grpc_jwt_verifier_verify (&exec_ctx, verifier, &sync.pollset, jwt, aud, on_jwt_verification_done, &sync);
 
   gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset));
   while (!sync.is_done)
     {
       grpc_pollset_worker worker;
-      grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list);
+      grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC));
       gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset));
       grpc_exec_ctx_finish (&exec_ctx);
       gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset));