Convert base::Bind and base::Callback in chrome/test to Once/Repeating

Fix
- SyncWebsocketFactory
- MessageCallback
- ConditionalWaitCallback

Change-Id: I9bf3e90df4a4217e158857dc90d4d7356dabcfa4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2298264Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789200}

chrome/test/chromedriver/chrome/web_view_impl_unittest.cc

@@ -245,7 +245,7 @@ std::unique_ptr<SyncWebSocket> CreateMockSyncWebSocket(
 
 TEST(CreateChild, MultiLevel) {
   SyncWebSocketFactory factory =
-      base::Bind(&CreateMockSyncWebSocket, SyncWebSocket::kOk);
+      base::BindRepeating(&CreateMockSyncWebSocket, SyncWebSocket::kOk);
   // CreateChild relies on client_ being a DevToolsClientImpl, so no mocking
   std::unique_ptr<DevToolsClientImpl> client_uptr =
       std::make_unique<DevToolsClientImpl>(factory, "http://url", "id");
@@ -266,7 +266,7 @@ TEST(CreateChild, MultiLevel) {
 
 TEST(CreateChild, IsNonBlocking_NoErrors) {
   SyncWebSocketFactory factory =
-      base::Bind(&CreateMockSyncWebSocket, SyncWebSocket::kOk);
+      base::BindRepeating(&CreateMockSyncWebSocket, SyncWebSocket::kOk);
   // CreateChild relies on client_ being a DevToolsClientImpl, so no mocking
   std::unique_ptr<DevToolsClientImpl> client_uptr =
       std::make_unique<DevToolsClientImpl>(factory, "http://url", "id");
@@ -286,7 +286,7 @@ TEST(CreateChild, IsNonBlocking_NoErrors) {
 
 TEST(CreateChild, Load_NoErrors) {
   SyncWebSocketFactory factory =
-      base::Bind(&CreateMockSyncWebSocket, SyncWebSocket::kOk);
+      base::BindRepeating(&CreateMockSyncWebSocket, SyncWebSocket::kOk);
   // CreateChild relies on client_ being a DevToolsClientImpl, so no mocking
   std::unique_ptr<DevToolsClientImpl> client_uptr =
       std::make_unique<DevToolsClientImpl>(factory, "http://url", "id");
@@ -304,7 +304,7 @@ TEST(CreateChild, Load_NoErrors) {
 
 TEST(CreateChild, WaitForPendingNavigations_NoErrors) {
   SyncWebSocketFactory factory =
-      base::Bind(&CreateMockSyncWebSocket, SyncWebSocket::kTimeout);
+      base::BindRepeating(&CreateMockSyncWebSocket, SyncWebSocket::kTimeout);
   // CreateChild relies on client_ being a DevToolsClientImpl, so no mocking
   std::unique_ptr<DevToolsClientImpl> client_uptr =
       std::make_unique<DevToolsClientImpl>(factory, "http://url", "id");
@@ -324,7 +324,7 @@ TEST(CreateChild, WaitForPendingNavigations_NoErrors) {
 
 TEST(CreateChild, IsPendingNavigation_NoErrors) {
   SyncWebSocketFactory factory =
-      base::Bind(&CreateMockSyncWebSocket, SyncWebSocket::kOk);
+      base::BindRepeating(&CreateMockSyncWebSocket, SyncWebSocket::kOk);
   // CreateChild relies on client_ being a DevToolsClientImpl, so no mocking
   std::unique_ptr<DevToolsClientImpl> client_uptr =
       std::make_unique<DevToolsClientImpl>(factory, "http://url", "id");

chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc

@@ -111,7 +111,7 @@ TEST_F(SyncWebSocketImplTest, SendReceiveTimeout) {
   base::WaitableEvent server_reply_allowed(
       base::WaitableEvent::ResetPolicy::AUTOMATIC,
       base::WaitableEvent::InitialState::NOT_SIGNALED);
-  server_.SetMessageCallback(base::Bind(
+  server_.SetMessageCallback(base::BindOnce(
       &base::WaitableEvent::Wait, base::Unretained(&server_reply_allowed)));
 
   ASSERT_TRUE(sock.Connect(server_.web_socket_url()));

chrome/test/chromedriver/net/test_http_server.cc

@@ -25,9 +25,7 @@ const int kBufferSize = 100 * 1024 * 1024;  // 100 MB
 TestHttpServer::TestHttpServer()
     : thread_("ServerThread"),
       all_closed_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
-                        base::WaitableEvent::InitialState::SIGNALED),
-      request_action_(kAccept),
-      message_action_(kEchoMessage) {}
+                        base::WaitableEvent::InitialState::SIGNALED) {}
 
 TestHttpServer::~TestHttpServer() {
 }
@@ -74,9 +72,9 @@ void TestHttpServer::SetMessageAction(WebSocketMessageAction action) {
   message_action_ = action;
 }
 
-void TestHttpServer::SetMessageCallback(const base::Closure& callback) {
+void TestHttpServer::SetMessageCallback(base::OnceClosure callback) {
   base::AutoLock lock(action_lock_);
-  message_callback_ = callback;
+  message_callback_ = std::move(callback);
 }
 
 GURL TestHttpServer::web_socket_url() const {
@@ -116,14 +114,12 @@ void TestHttpServer::OnWebSocketRequest(
 
 void TestHttpServer::OnWebSocketMessage(int connection_id, std::string data) {
   WebSocketMessageAction action;
-  base::Closure callback;
   {
     base::AutoLock lock(action_lock_);
     action = message_action_;
-    callback = std::move(message_callback_);
   }
-  if (!callback.is_null())
-    callback.Run();
+  if (!message_callback_.is_null())
+    std::move(message_callback_).Run();
   switch (action) {
     case kEchoMessage:
       server_->SendOverWebSocket(connection_id, data,

chrome/test/chromedriver/net/test_http_server.h

@@ -58,7 +58,7 @@ class TestHttpServer : public net::HttpServer::Delegate {
   void SetMessageAction(WebSocketMessageAction action);
 
   // Sets a callback to be called once when receiving next WebSocket message.
-  void SetMessageCallback(const base::Closure& callback);
+  void SetMessageCallback(base::OnceClosure callback);
 
   // Returns the web socket URL that points to the server.
   GURL web_socket_url() const;
@@ -92,9 +92,9 @@ class TestHttpServer : public net::HttpServer::Delegate {
 
   // Protects the action flags and |message_callback_|.
   base::Lock action_lock_;
-  WebSocketRequestAction request_action_;
-  WebSocketMessageAction message_action_;
-  base::Closure message_callback_;
+  WebSocketRequestAction request_action_ = kAccept;
+  WebSocketMessageAction message_action_ = kEchoMessage;
+  base::OnceClosure message_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TestHttpServer);
 };

chrome/test/media_router/media_router_base_browsertest.cc

@@ -80,7 +80,7 @@ void MediaRouterBaseBrowserTest::UninstallMRExtension() {
 bool MediaRouterBaseBrowserTest::ConditionalWait(
     base::TimeDelta timeout,
     base::TimeDelta interval,
-    const base::Callback<bool(void)>& callback) {
+    const base::RepeatingCallback<bool(void)>& callback) {
   base::ElapsedTimer timer;
   do {
     if (callback.Run())

chrome/test/media_router/media_router_base_browsertest.h

@@ -57,7 +57,7 @@ class MediaRouterBaseBrowserTest : public extensions::ExtensionBrowserTest,
   // TODO(leilei): Replace this method with WaitableEvent class.
   bool ConditionalWait(base::TimeDelta timeout,
                        base::TimeDelta interval,
-                       const base::Callback<bool(void)>& callback);
+                       const base::RepeatingCallback<bool(void)>& callback);
 
   // Wait for a specific time.
   void Wait(base::TimeDelta timeout);

chrome/test/media_router/media_router_e2e_browsertest.cc

@@ -83,8 +83,8 @@ void MediaRouterE2EBrowserTest::CreateMediaRoute(
   // Wait for MediaSinks compatible with |source| to be discovered.
   ASSERT_TRUE(ConditionalWait(
       base::TimeDelta::FromSeconds(30), base::TimeDelta::FromSeconds(1),
-      base::Bind(&MediaRouterE2EBrowserTest::IsSinkDiscovered,
-                 base::Unretained(this))));
+      base::BindRepeating(&MediaRouterE2EBrowserTest::IsSinkDiscovered,
+                          base::Unretained(this))));
 
   const auto& sink_map = observer_->sink_map;
   const auto it = sink_map.find(receiver_);
@@ -100,8 +100,8 @@ void MediaRouterE2EBrowserTest::CreateMediaRoute(
   // Wait for the route request to be fulfilled (and route to be started).
   ASSERT_TRUE(ConditionalWait(
       base::TimeDelta::FromSeconds(30), base::TimeDelta::FromSeconds(1),
-      base::Bind(&MediaRouterE2EBrowserTest::IsRouteCreated,
-                 base::Unretained(this))));
+      base::BindRepeating(&MediaRouterE2EBrowserTest::IsRouteCreated,
+                          base::Unretained(this))));
 }
 
 void MediaRouterE2EBrowserTest::StopMediaRoute() {