commit a4a5093b5b6a8323bc1894b0f7443eac300b675d
author Bence Béky <bnc@chromium.org> Fri Aug 10 13:39:41 2018
committer Commit Bot <commit-bot@chromium.org> Fri Aug 10 13:39:41 2018
tree f17ea54dbcf8b63783aeebaa02f532262a66f237
parent 0ccfd704d43839e7587d3fe9927a7b797c22d514

Use CompletionOnceCallback in //net.

Use CompletionOnceCallback instead of CompletionCallback everywhere in
//net, except for TestCompletionCallback that still has consumers
outside //net.

Bug: 807724
Change-Id: Iec756bd8cc40acbeecacfe0e5c3eee949325afb6
Reviewed-on: https://chromium-review.googlesource.com/1167462
Commit-Queue: Bence Béky <bnc@chromium.org>
Reviewed-by: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582137}

net/socket/client_socket_pool_base_unittest.cc

diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 7a17f045..309047a1e 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -1540,7 +1540,7 @@
                              TestClientSocketPool* pool,
                              TestConnectJobFactory* test_connect_job_factory,
                              TestConnectJob::JobType next_job_type,
-                             const CompletionCallback& nested_callback,
+                             TestCompletionCallback* nested_callback,
                              int first_request_result) {
   EXPECT_THAT(first_request_result, IsOk());
 
@@ -1555,10 +1555,10 @@
   TestCompletionCallback callback;
   int rv = handle->Init("a", params, LOWEST, SocketTag(),
                         ClientSocketPool::RespectLimits::ENABLED,
-                        nested_callback, pool, NetLogWithSource());
+                        nested_callback->callback(), pool, NetLogWithSource());
   if (rv != ERR_IO_PENDING) {
     DCHECK_EQ(TestConnectJob::kMockJob, next_job_type);
-    nested_callback.Run(rv);
+    nested_callback->callback().Run(rv);
   } else {
     DCHECK_EQ(TestConnectJob::kMockPendingJob, next_job_type);
   }
@@ -1578,7 +1578,7 @@
       ClientSocketPool::RespectLimits::ENABLED,
       base::Bind(&RequestSocketOnComplete, &handle, pool_.get(),
                  connect_job_factory_, TestConnectJob::kMockPendingJob,
-                 second_result_callback.callback()),
+                 &second_result_callback),
       pool_.get(), NetLogWithSource());
   ASSERT_THAT(rv, IsError(ERR_IO_PENDING));
 
@@ -1599,7 +1599,7 @@
       ClientSocketPool::RespectLimits::ENABLED,
       base::Bind(&RequestSocketOnComplete, &handle, pool_.get(),
                  connect_job_factory_, TestConnectJob::kMockPendingJob,
-                 second_result_callback.callback()),
+                 &second_result_callback),
       pool_.get(), NetLogWithSource());
   ASSERT_THAT(rv, IsError(ERR_IO_PENDING));