Convert WebSocketTransportClientSocketPoolTest to use OnceClosure

Bug: 1007815
Change-Id: Id2e44ecc0bac22f9db94eb86247f71c29d359447
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2087346
Commit-Queue: Matt Menke <mmenke@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746896}

net/socket/transport_client_socket_pool_test_util.cc

@@ -199,8 +199,8 @@ class MockTriggerableClientSocket : public TransportClientSocket {
   // Call this method to get a closure which will trigger the connect callback
   // when called. The closure can be called even after the socket is deleted; it
   // will safely do nothing.
-  base::Closure GetConnectCallback() {
-    return base::Bind(&MockTriggerableClientSocket::DoCallback,
+  base::OnceClosure GetConnectCallback() {
+    return base::BindOnce(&MockTriggerableClientSocket::DoCallback,
                           weak_factory_.GetWeakPtr());
   }
 
@@ -432,7 +432,7 @@ MockTransportClientSocketFactory::CreateTransportClientSocket(
       // don't need to worry about atomicity because this code is
       // single-threaded.
       if (!run_loop_quit_closure_.is_null())
-        run_loop_quit_closure_.Run();
+        std::move(run_loop_quit_closure_).Run();
       return std::move(rv);
     }
     default:
@@ -476,7 +476,7 @@ void MockTransportClientSocketFactory::set_client_socket_types(
   client_socket_index_max_ = num_types;
 }
 
-base::Closure
+base::OnceClosure
 MockTransportClientSocketFactory::WaitForTriggerableSocketCreation() {
   while (triggerable_sockets_.empty()) {
     base::RunLoop run_loop;
@@ -484,7 +484,7 @@ MockTransportClientSocketFactory::WaitForTriggerableSocketCreation() {
     run_loop.Run();
     run_loop_quit_closure_.Reset();
   }
-  base::Closure trigger = triggerable_sockets_.front();
+  base::OnceClosure trigger = std::move(triggerable_sockets_.front());
   triggerable_sockets_.pop();
   return trigger;
 }

net/socket/transport_client_socket_pool_test_util.h

@@ -122,7 +122,7 @@ class MockTransportClientSocketFactory : public ClientSocketFactory {
   // have been created yet, wait for one to be created before returning the
   // Closure. This method should be called the same number of times as
   // MOCK_TRIGGERABLE_CLIENT_SOCKETs are created in the test.
-  base::Closure WaitForTriggerableSocketCreation();
+  base::OnceClosure WaitForTriggerableSocketCreation();
 
  private:
   NetLog* net_log_;
@@ -132,8 +132,8 @@ class MockTransportClientSocketFactory : public ClientSocketFactory {
   int client_socket_index_;
   int client_socket_index_max_;
   base::TimeDelta delay_;
-  base::queue<base::Closure> triggerable_sockets_;
-  base::Closure run_loop_quit_closure_;
+  base::queue<base::OnceClosure> triggerable_sockets_;
+  base::OnceClosure run_loop_quit_closure_;
 
   DISALLOW_COPY_AND_ASSIGN(MockTransportClientSocketFactory);
 };

net/socket/websocket_transport_client_socket_pool_unittest.cc

@@ -58,9 +58,9 @@ const RequestPriority kDefaultPriority = LOW;
 // RunLoop doesn't support this natively but it is easy to emulate.
 void RunLoopForTimePeriod(base::TimeDelta period) {
   base::RunLoop run_loop;
-  base::Closure quit_closure(run_loop.QuitClosure());
-  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(FROM_HERE, quit_closure,
-                                                       period);
+  base::OnceClosure quit_closure(run_loop.QuitClosure());
+  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+      FROM_HERE, std::move(quit_closure), period);
   run_loop.Run();
 }
 
@@ -795,13 +795,13 @@ TEST_F(WebSocketTransportClientSocketPoolTest, FirstSuccessWins) {
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
   ASSERT_FALSE(handle.socket());
 
-  base::Closure ipv6_connect_trigger =
+  base::OnceClosure ipv6_connect_trigger =
       client_socket_factory_.WaitForTriggerableSocketCreation();
-  base::Closure ipv4_connect_trigger =
+  base::OnceClosure ipv4_connect_trigger =
       client_socket_factory_.WaitForTriggerableSocketCreation();
 
-  ipv4_connect_trigger.Run();
-  ipv6_connect_trigger.Run();
+  std::move(ipv4_connect_trigger).Run();
+  std::move(ipv6_connect_trigger).Run();
 
   EXPECT_THAT(callback.WaitForResult(), IsOk());
   ASSERT_TRUE(handle.socket());
@@ -1096,10 +1096,10 @@ TEST_F(WebSocketTransportClientSocketPoolTest, CancelRequestReclaimsSockets) {
 
   EXPECT_THAT(StartRequest(kDefaultPriority), IsError(ERR_IO_PENDING));
 
-  base::Closure connect_trigger =
+  base::OnceClosure connect_trigger =
       client_socket_factory_.WaitForTriggerableSocketCreation();
 
-  connect_trigger.Run();  // Calls InvokeUserCallbackLater()
+  std::move(connect_trigger).Run();  // Calls InvokeUserCallbackLater()
 
   request(0)->handle()->Reset();  // calls CancelRequest()