summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_transaction_unittest.cc
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 05:33:02 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 05:33:02 +0000
commit8b114dd781075604530544cf60e665fa4306903c (patch)
treecaa2d8ef403d08ffab8dac31a126d84947990b1c /net/http/http_network_transaction_unittest.cc
parentbd0875ed222d58f51816ebb08e6203ef94053276 (diff)
downloadchromium_src-8b114dd781075604530544cf60e665fa4306903c.zip
chromium_src-8b114dd781075604530544cf60e665fa4306903c.tar.gz
chromium_src-8b114dd781075604530544cf60e665fa4306903c.tar.bz2
Enable IP pooling for SPDY.
Added a command-line switch: --enable-ip-pooling BUG=42669 TEST=SpdySessionTest.IPPool* Review URL: http://codereview.chromium.org/6594116 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_transaction_unittest.cc')
-rw-r--r--net/http/http_network_transaction_unittest.cc18
1 files changed, 12 insertions, 6 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index dff3bdf..6e7e5fd 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -5439,9 +5439,8 @@ struct GroupNameTest {
};
scoped_refptr<HttpNetworkSession> SetupSessionForGroupNameTests(
- const std::string& proxy_server) {
- SessionDependencies session_deps(ProxyService::CreateFixed(proxy_server));
- scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
+ SessionDependencies* session_deps) {
+ scoped_refptr<HttpNetworkSession> session(CreateSession(session_deps));
HttpAlternateProtocols* alternate_protocols =
session->mutable_alternate_protocols();
@@ -5507,8 +5506,10 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForDirectConnections) {
HttpStreamFactory::set_use_alternate_protocols(true);
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+ SessionDependencies session_deps(
+ ProxyService::CreateFixed(tests[i].proxy_server));
scoped_refptr<HttpNetworkSession> session(
- SetupSessionForGroupNameTests(tests[i].proxy_server));
+ SetupSessionForGroupNameTests(&session_deps));
HttpNetworkSessionPeer peer(session);
CaptureGroupNameTCPSocketPool* tcp_conn_pool =
@@ -5559,8 +5560,10 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForHTTPProxyConnections) {
HttpStreamFactory::set_use_alternate_protocols(true);
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+ SessionDependencies session_deps(
+ ProxyService::CreateFixed(tests[i].proxy_server));
scoped_refptr<HttpNetworkSession> session(
- SetupSessionForGroupNameTests(tests[i].proxy_server));
+ SetupSessionForGroupNameTests(&session_deps));
HttpNetworkSessionPeer peer(session);
@@ -5625,8 +5628,11 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForSOCKSConnections) {
HttpStreamFactory::set_use_alternate_protocols(true);
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+ SessionDependencies session_deps(
+ ProxyService::CreateFixed(tests[i].proxy_server));
scoped_refptr<HttpNetworkSession> session(
- SetupSessionForGroupNameTests(tests[i].proxy_server));
+ SetupSessionForGroupNameTests(&session_deps));
+
HttpNetworkSessionPeer peer(session);
HostPortPair proxy_host("socks_proxy", 1080);