Merge branch 'master' into tjagtap_src_core_ext_xds

src/core/lib/event_engine/windows/windows_engine.cc

@@ -370,7 +370,7 @@ EventEngine::ConnectionHandle WindowsEventEngine::Connect(
   auto connection_state = std::make_shared<ConnectionState>();
   grpc_core::MutexLock lock(&connection_state->mu);
   connection_state->socket = iocp_.Watch(sock);
-  CHECK_NE(connection_state->socket, nullptr);
+  CHECK(connection_state->socket != nullptr);
   auto* info = connection_state->socket->write_info();
   connection_state->address = address;
   connection_state->allocator = std::move(memory_allocator);

test/core/end2end/fuzzers/network_input.cc

@@ -506,8 +506,8 @@ Duration ScheduleConnection(
             Duration::NanosecondsRoundUp(
                 (q.slices.Length() * event_engine->max_delay_write()).count()));
   }
-  delay += Duration::Milliseconds(network_input.connect_delay_ms() +
-                                  network_input.connect_timeout_ms());
+  delay += Duration::Milliseconds(network_input.connect_delay_ms()) +
+           Duration::Milliseconds(network_input.connect_timeout_ms());
   event_engine->RunAfterExactly(
       Duration::Milliseconds(network_input.connect_delay_ms()),
       [event_engine, channel_args,

test/cpp/performance/writes_per_rpc_test.cc

@@ -81,16 +81,16 @@ class InProcessCHTTP2 {
           listener_endpoint = std::move(ep);
           listener_started.Notify();
         },
-        [](absl::Status status) { CHECK_OK(status); }, config,
+        [](absl::Status status) { CHECK(status.ok()); }, config,
         std::make_unique<grpc_core::MemoryQuota>("foo"));
     if (!listener.ok()) {
       grpc_core::Crash(absl::StrCat("failed to start listener: ",
                                     listener.status().ToString()));
     }
     auto target_addr = URIToResolvedAddress(addr);
-    CHECK_OK(target_addr);
-    CHECK_OK((*listener)->Bind(*target_addr));
-    CHECK_OK((*listener)->Start());
+    CHECK(target_addr.ok());
+    CHECK((*listener)->Bind(*target_addr).ok());
+    CHECK((*listener)->Start().ok());
     // Creating the client
     std::unique_ptr<EventEngine::Endpoint> client_endpoint;
     grpc_core::Notification client_connected;
@@ -98,7 +98,7 @@ class InProcessCHTTP2 {
         std::make_unique<grpc_core::MemoryQuota>("client");
     std::ignore = fuzzing_engine->Connect(
         [&](absl::StatusOr<std::unique_ptr<EventEngine::Endpoint>> endpoint) {
-          CHECK_OK(endpoint);
+          CHECK(endpoint.ok());
           client_endpoint = std::move(*endpoint);
           client_connected.Notify();
         },