Index: net/http/http_network_transaction_unittest.cc |
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc |
index f5afd74a88d82e7cf8d2ea4d13b364e5f1a97392..f8a53dba122760e640c20bed7a563365199322d0 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -45,6 +45,7 @@ |
#include "net/proxy/proxy_resolver.h" |
#include "net/proxy/proxy_service.h" |
#include "net/socket/client_socket_factory.h" |
+#include "net/socket/mock_client_socket_pool_manager.h" |
#include "net/socket/socket_test_util.h" |
#include "net/socket/ssl_client_socket.h" |
#include "net/spdy/spdy_framer.h" |
@@ -5626,10 +5627,13 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForDirectConnections) { |
HttpNetworkSessionPeer peer(session); |
CaptureGroupNameTransportSocketPool* transport_conn_pool = |
new CaptureGroupNameTransportSocketPool(NULL, NULL); |
- peer.SetTransportSocketPool(transport_conn_pool); |
CaptureGroupNameSSLSocketPool* ssl_conn_pool = |
new CaptureGroupNameSSLSocketPool(NULL, NULL); |
- peer.SetSSLSocketPool(ssl_conn_pool); |
+ MockClientSocketPoolManager* mock_pool_manager = |
+ new MockClientSocketPoolManager; |
+ mock_pool_manager->SetTransportSocketPool(transport_conn_pool); |
+ mock_pool_manager->SetSSLSocketPool(ssl_conn_pool); |
+ peer.SetClientSocketPoolManager(mock_pool_manager); |
EXPECT_EQ(ERR_IO_PENDING, |
GroupNameTransactionHelper(tests[i].url, session)); |
@@ -5682,10 +5686,14 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForHTTPProxyConnections) { |
HostPortPair proxy_host("http_proxy", 80); |
CaptureGroupNameHttpProxySocketPool* http_proxy_pool = |
new CaptureGroupNameHttpProxySocketPool(NULL, NULL); |
- peer.SetSocketPoolForHTTPProxy(proxy_host, http_proxy_pool); |
CaptureGroupNameSSLSocketPool* ssl_conn_pool = |
new CaptureGroupNameSSLSocketPool(NULL, NULL); |
- peer.SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool); |
+ |
+ MockClientSocketPoolManager* mock_pool_manager = |
+ 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); |
EXPECT_EQ(ERR_IO_PENDING, |
GroupNameTransactionHelper(tests[i].url, session)); |
@@ -5750,10 +5758,14 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForSOCKSConnections) { |
HostPortPair proxy_host("socks_proxy", 1080); |
CaptureGroupNameSOCKSSocketPool* socks_conn_pool = |
new CaptureGroupNameSOCKSSocketPool(NULL, NULL); |
- peer.SetSocketPoolForSOCKSProxy(proxy_host, socks_conn_pool); |
CaptureGroupNameSSLSocketPool* ssl_conn_pool = |
new CaptureGroupNameSSLSocketPool(NULL, NULL); |
- peer.SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool); |
+ |
+ MockClientSocketPoolManager* mock_pool_manager = |
+ new MockClientSocketPoolManager; |
+ mock_pool_manager->SetSocketPoolForSOCKSProxy(proxy_host, socks_conn_pool); |
+ mock_pool_manager->SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool); |
+ peer.SetClientSocketPoolManager(mock_pool_manager); |
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); |
@@ -7761,7 +7773,10 @@ TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { |
session_deps.host_resolver.get(), |
&session_deps.socket_factory, |
session_deps.net_log); |
- session_peer.SetTransportSocketPool(transport_pool); |
+ MockClientSocketPoolManager* mock_pool_manager = |
+ new MockClientSocketPoolManager; |
+ mock_pool_manager->SetTransportSocketPool(transport_pool); |
+ session_peer.SetClientSocketPoolManager(mock_pool_manager); |
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); |
TestOldCompletionCallback callback; |