Index: net/http/http_stream_factory_impl_unittest.cc |
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc |
index 10a5881e30b25ef281c5cf8bcf63dd7a560941a1..2a87dd1eafab6d499fe22b6359c5b209500f09d4 100644 |
--- a/net/http/http_stream_factory_impl_unittest.cc |
+++ b/net/http/http_stream_factory_impl_unittest.cc |
@@ -5,8 +5,8 @@ |
#include "net/http/http_stream_factory_impl.h" |
#include <stdint.h> |
- |
#include <string> |
+#include <utility> |
#include <vector> |
#include "base/compiler_specific.h" |
@@ -286,7 +286,7 @@ class WebSocketBasicHandshakeStream : public MockWebSocketHandshakeStream { |
explicit WebSocketBasicHandshakeStream( |
scoped_ptr<ClientSocketHandle> connection) |
: MockWebSocketHandshakeStream(kStreamTypeBasic), |
- connection_(connection.Pass()) {} |
+ connection_(std::move(connection)) {} |
~WebSocketBasicHandshakeStream() override { |
connection_->socket()->Disconnect(); |
@@ -306,7 +306,7 @@ class WebSocketStreamCreateHelper |
WebSocketHandshakeStreamBase* CreateBasicStream( |
scoped_ptr<ClientSocketHandle> connection, |
bool using_proxy) override { |
- return new WebSocketBasicHandshakeStream(connection.Pass()); |
+ return new WebSocketBasicHandshakeStream(std::move(connection)); |
} |
WebSocketHandshakeStreamBase* CreateSpdyStream( |
@@ -486,7 +486,7 @@ TEST_P(HttpStreamFactoryTest, PreconnectDirect) { |
new MockClientSocketPoolManager); |
mock_pool_manager->SetTransportSocketPool(transport_conn_pool); |
mock_pool_manager->SetSSLSocketPool(ssl_conn_pool); |
- peer.SetClientSocketPoolManager(mock_pool_manager.Pass()); |
+ peer.SetClientSocketPoolManager(std::move(mock_pool_manager)); |
PreconnectHelper(kTests[i], session.get()); |
if (kTests[i].ssl) |
EXPECT_EQ(kTests[i].num_streams, ssl_conn_pool->last_num_streams()); |
@@ -515,7 +515,7 @@ TEST_P(HttpStreamFactoryTest, PreconnectHttpProxy) { |
new MockClientSocketPoolManager); |
mock_pool_manager->SetSocketPoolForHTTPProxy(proxy_host, http_proxy_pool); |
mock_pool_manager->SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool); |
- peer.SetClientSocketPoolManager(mock_pool_manager.Pass()); |
+ peer.SetClientSocketPoolManager(std::move(mock_pool_manager)); |
PreconnectHelper(kTests[i], session.get()); |
if (kTests[i].ssl) |
EXPECT_EQ(kTests[i].num_streams, ssl_conn_pool->last_num_streams()); |
@@ -544,7 +544,7 @@ TEST_P(HttpStreamFactoryTest, PreconnectSocksProxy) { |
new MockClientSocketPoolManager); |
mock_pool_manager->SetSocketPoolForSOCKSProxy(proxy_host, socks_proxy_pool); |
mock_pool_manager->SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool); |
- peer.SetClientSocketPoolManager(mock_pool_manager.Pass()); |
+ peer.SetClientSocketPoolManager(std::move(mock_pool_manager)); |
PreconnectHelper(kTests[i], session.get()); |
if (kTests[i].ssl) |
EXPECT_EQ(kTests[i].num_streams, ssl_conn_pool->last_num_streams()); |
@@ -579,7 +579,7 @@ TEST_P(HttpStreamFactoryTest, PreconnectDirectWithExistingSpdySession) { |
new MockClientSocketPoolManager); |
mock_pool_manager->SetTransportSocketPool(transport_conn_pool); |
mock_pool_manager->SetSSLSocketPool(ssl_conn_pool); |
- peer.SetClientSocketPoolManager(mock_pool_manager.Pass()); |
+ peer.SetClientSocketPoolManager(std::move(mock_pool_manager)); |
PreconnectHelper(kTests[i], session.get()); |
// We shouldn't be preconnecting if we have an existing session, which is |
// the case for https://www.google.com. |
@@ -608,7 +608,7 @@ TEST_P(HttpStreamFactoryTest, PreconnectUnsafePort) { |
scoped_ptr<MockClientSocketPoolManager> mock_pool_manager( |
new MockClientSocketPoolManager); |
mock_pool_manager->SetTransportSocketPool(transport_conn_pool); |
- peer.SetClientSocketPoolManager(mock_pool_manager.Pass()); |
+ peer.SetClientSocketPoolManager(std::move(mock_pool_manager)); |
PreconnectHelperForURL(1, GURL("http://www.google.com:7"), session.get()); |
EXPECT_EQ(-1, transport_conn_pool->last_num_streams()); |
@@ -829,7 +829,7 @@ TEST_P(HttpStreamFactoryTest, UsePreConnectIfNoZeroRTT) { |
new MockClientSocketPoolManager); |
mock_pool_manager->SetSocketPoolForHTTPProxy(proxy_host, http_proxy_pool); |
mock_pool_manager->SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool); |
- peer.SetClientSocketPoolManager(mock_pool_manager.Pass()); |
+ peer.SetClientSocketPoolManager(std::move(mock_pool_manager)); |
PreconnectHelperForURL(num_streams, url, session.get()); |
EXPECT_EQ(num_streams, ssl_conn_pool->last_num_streams()); |
} |
@@ -874,7 +874,7 @@ TEST_P(HttpStreamFactoryTest, QuicDisablePreConnectIfZeroRtt) { |
scoped_ptr<MockClientSocketPoolManager> mock_pool_manager( |
new MockClientSocketPoolManager); |
mock_pool_manager->SetTransportSocketPool(transport_conn_pool); |
- peer.SetClientSocketPoolManager(mock_pool_manager.Pass()); |
+ peer.SetClientSocketPoolManager(std::move(mock_pool_manager)); |
HttpRequestInfo request; |
request.method = "GET"; |