fix

src/core/lib/iomgr/combiner.cc

@@ -51,10 +51,6 @@ static void combiner_finally_exec(grpc_core::Combiner* lock,
                                   grpc_closure* closure,
                                   grpc_error_handle error);
 
-// TODO(ctiller): delete this when the combiner_offload_to_event_engine
-// experiment is removed.
-static void offload(void* arg, grpc_error_handle error);
-
 grpc_core::Combiner* grpc_combiner_create(
     std::shared_ptr<grpc_event_engine::experimental::EventEngine>
         event_engine) {
@@ -262,7 +258,7 @@ bool grpc_combiner_continue_exec_ctx() {
 // Define a macro to ease readability of the following switch statement.
 #define OLD_STATE_WAS(orphaned, elem_count) \
   (((orphaned) ? 0 : STATE_UNORPHANED) |    \
-   ((elem_count)*STATE_ELEM_COUNT_LOW_BIT))
+   ((elem_count) * STATE_ELEM_COUNT_LOW_BIT))
   // Depending on what the previous state was, we need to perform different
   // actions.
   switch (old_state) {

test/core/bad_client/tests/initial_settings_frame.cc

@@ -200,12 +200,11 @@ int main(int argc, char** argv) {
                            GRPC_BAD_CLIENT_DISCONNECT);
 
   // too many requests before the settings ack is sent should be cancelled
-  if (grpc_core::IsBlockExcessiveRequestsBeforeSettingsAckEnabled()) {
+  GRPC_RUN_BAD_CLIENT_TEST(
-    GRPC_RUN_BAD_CLIENT_TEST(single_request_verifier, nullptr,
+      single_request_verifier, nullptr,
-                             PFX_STR ZERO_SETTING_HDR FOOBAR_0 FOOBAR_2
+      PFX_STR ZERO_SETTING_HDR FOOBAR_0 FOOBAR_2 SETTING_ACK RST_STREAM_1 RST_STREAM_3
-                                 SETTING_ACK RST_STREAM_1 RST_STREAM_3 FOOBAR_1,
+          FOOBAR_1,
-                             GRPC_BAD_CLIENT_MAX_CONCURRENT_REQUESTS_OF_ONE);
+      GRPC_BAD_CLIENT_MAX_CONCURRENT_REQUESTS_OF_ONE);
-  }
 
   grpc_shutdown();
   return 0;