| 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();
|
|
|