Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2109)

Unified Diff: net/socket/transport_client_socket_pool_test_util.cc

Issue 1545233002: Convert Pass()→std::move() in //net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/transport_client_socket_pool.cc ('k') | net/socket/unix_domain_client_socket_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/transport_client_socket_pool_test_util.cc
diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc
index c4378cd9e56ad9305c6a52871e5a8ac0619137c0..0140c255e1878d2e4176eadee5db760ccd6242ad 100644
--- a/net/socket/transport_client_socket_pool_test_util.cc
+++ b/net/socket/transport_client_socket_pool_test_util.cc
@@ -5,8 +5,8 @@
#include "net/socket/transport_client_socket_pool_test_util.h"
#include <stdint.h>
-
#include <string>
+#include <utility>
#include "base/location.h"
#include "base/logging.h"
@@ -205,7 +205,7 @@ class MockTriggerableClientSocket : public StreamSocket {
new MockTriggerableClientSocket(addrlist, should_connect, net_log));
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
socket->GetConnectCallback());
- return socket.Pass();
+ return std::move(socket);
}
static scoped_ptr<StreamSocket> MakeMockDelayedClientSocket(
@@ -217,7 +217,7 @@ class MockTriggerableClientSocket : public StreamSocket {
new MockTriggerableClientSocket(addrlist, should_connect, net_log));
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, socket->GetConnectCallback(), delay);
- return socket.Pass();
+ return std::move(socket);
}
static scoped_ptr<StreamSocket> MakeMockStalledClientSocket(
@@ -232,7 +232,7 @@ class MockTriggerableClientSocket : public StreamSocket {
attempts.push_back(ConnectionAttempt(addrlist[0], ERR_CONNECTION_FAILED));
socket->AddConnectionAttempts(attempts);
}
- return socket.Pass();
+ return std::move(socket);
}
// StreamSocket implementation.
@@ -425,7 +425,7 @@ MockTransportClientSocketFactory::CreateTransportClientSocket(
// single-threaded.
if (!run_loop_quit_closure_.is_null())
run_loop_quit_closure_.Run();
- return rv.Pass();
+ return std::move(rv);
}
default:
NOTREACHED();
« no previous file with comments | « net/socket/transport_client_socket_pool.cc ('k') | net/socket/unix_domain_client_socket_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698