Merge pull request #86 from eugeneo/create-pull-request/patch-8320342

Automated fix for refs/heads/tasks/ads-delay
eugeneo · Dec 2, 2023 · 979013f · 979013f
2 parents 8320342 + 0545101
commit 979013f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/test/core/xds/xds_client_ads_stream_wait_test.cc b/test/core/xds/xds_client_ads_stream_wait_test.cc
@@ -15,9 +15,7 @@
 //
 
 #include <memory>
-#include <optional>
 #include <string_view>
-#include <utility>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"

diff --git a/test/core/xds/xds_client_test_lib.h b/test/core/xds/xds_client_test_lib.h
@@ -43,7 +43,6 @@
 #include "google/protobuf/util/json_util.h"
 #include "gtest/gtest.h"
 #include "upb/reflection/def.h"
-#include "xds_transport_fake.h"
 
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>

diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc
@@ -18,7 +18,6 @@
 
 #include "test/core/xds/xds_transport_fake.h"
 
-#include <cstddef>
 #include <functional>
 #include <memory>
 #include <string>
@@ -127,7 +126,7 @@ void FakeXdsTransportFactory::FakeStreamingCall::CompleteSendMessageFromClient(
 
 void FakeXdsTransportFactory::FakeStreamingCall::StartRecvMessage() {
   absl::optional<std::string> pending;
-  grpc_core::ReleasableMutexLock lock(&mu_);
+  ReleasableMutexLock lock(&mu_);
   ASSERT_FALSE(read_pending_);
   read_count_ += 1;
   read_pending_ = true;
@@ -155,7 +154,7 @@ void FakeXdsTransportFactory::FakeStreamingCall::
     DispatchPendingMessageToClient() {
   ReleasableMutexLock lock(&mu_);
   if (!read_pending_ || to_client_messages_.empty()) {
-  return;
+    return;
   }
   read_pending_ = false;
   std::string message = std::move(to_client_messages_.front());

diff --git a/test/core/xds/xds_transport_fake.h b/test/core/xds/xds_transport_fake.h
@@ -19,6 +19,8 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stddef.h>
+
 #include <deque>
 #include <functional>
 #include <map>
@@ -31,7 +33,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-#include "gtest/gtest.h"
 
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/ext/xds/xds_transport.h"