Revert "Revert "All instances of exec_ctx being passed around in src/core removed""

2 files changed, 6 insertions, 10 deletions

diff --git a/src/core/lib/backoff/backoff.cc b/src/core/lib/backoff/backoff.cc
index dc754ddd82..da3b9b1b2d 100644
--- a/src/core/lib/backoff/backoff.cc
+++ b/src/core/lib/backoff/backoff.cc
@@ -32,12 +32,11 @@ void grpc_backoff_init(grpc_backoff* backoff, grpc_millis initial_backoff,
   backoff->rng_state = (uint32_t)gpr_now(GPR_CLOCK_REALTIME).tv_nsec;
 }
 
-grpc_backoff_result grpc_backoff_begin(grpc_exec_ctx* exec_ctx,
-                                       grpc_backoff* backoff) {
+grpc_backoff_result grpc_backoff_begin(grpc_backoff* backoff) {
   backoff->current_backoff = backoff->initial_backoff;
   const grpc_millis initial_timeout =
       GPR_MAX(backoff->initial_backoff, backoff->min_connect_timeout);
-  const grpc_millis now = grpc_exec_ctx_now(exec_ctx);
+  const grpc_millis now = grpc_core::ExecCtx::Get()->Now();
   const grpc_backoff_result result = {now + initial_timeout,
                                       now + backoff->current_backoff};
   return result;
@@ -57,8 +56,7 @@ static double generate_uniform_random_number_between(uint32_t* rng_state,
   return a + generate_uniform_random_number(rng_state) * range;
 }
 
-grpc_backoff_result grpc_backoff_step(grpc_exec_ctx* exec_ctx,
-                                      grpc_backoff* backoff) {
+grpc_backoff_result grpc_backoff_step(grpc_backoff* backoff) {
   backoff->current_backoff = (grpc_millis)(GPR_MIN(
       backoff->current_backoff * backoff->multiplier, backoff->max_backoff));
   const double jitter = generate_uniform_random_number_between(
@@ -69,7 +67,7 @@ grpc_backoff_result grpc_backoff_step(grpc_exec_ctx* exec_ctx,
               backoff->min_connect_timeout);
   const grpc_millis next_timeout = GPR_MIN(
       (grpc_millis)(backoff->current_backoff + jitter), backoff->max_backoff);
-  const grpc_millis now = grpc_exec_ctx_now(exec_ctx);
+  const grpc_millis now = grpc_core::ExecCtx::Get()->Now();
   const grpc_backoff_result result = {now + current_timeout,
                                       now + next_timeout};
   return result;
diff --git a/src/core/lib/backoff/backoff.h b/src/core/lib/backoff/backoff.h
index 0da9082e70..f61d14ec95 100644
--- a/src/core/lib/backoff/backoff.h
+++ b/src/core/lib/backoff/backoff.h
@@ -60,13 +60,11 @@ void grpc_backoff_init(grpc_backoff* backoff, grpc_millis initial_backoff,
 
 /// Begin retry loop: returns the deadlines to be used for the current attempt
 /// and the subsequent retry, if any.
-grpc_backoff_result grpc_backoff_begin(grpc_exec_ctx* exec_ctx,
-                                       grpc_backoff* backoff);
+grpc_backoff_result grpc_backoff_begin(grpc_backoff* backoff);
 
 /// Step a retry loop: returns the deadlines to be used for the current attempt
 /// and the subsequent retry, if any.
-grpc_backoff_result grpc_backoff_step(grpc_exec_ctx* exec_ctx,
-                                      grpc_backoff* backoff);
+grpc_backoff_result grpc_backoff_step(grpc_backoff* backoff);
 
 /// Reset the backoff, so the next grpc_backoff_step will be a
 /// grpc_backoff_begin.