diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 00:13:52 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 00:13:52 +0000 |
commit | a554a82621c260c45c310deb2d12653e61221ff5 (patch) | |
tree | 7cebe573f5deb37144572c53421b6620c59765e0 /net/http/http_network_transaction_unittest.cc | |
parent | 004a953d5432f7b752aeb1e574a0109b5ca2310a (diff) | |
download | chromium_src-a554a82621c260c45c310deb2d12653e61221ff5.zip chromium_src-a554a82621c260c45c310deb2d12653e61221ff5.tar.gz chromium_src-a554a82621c260c45c310deb2d12653e61221ff5.tar.bz2 |
Revert r47395. Looks like it still crashes =/
BUG=40455,40457
Review URL: http://codereview.chromium.org/2104013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_transaction_unittest.cc')
-rw-r--r-- | net/http/http_network_transaction_unittest.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 9985d94..6dac810 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -82,20 +82,23 @@ class SessionDependencies { : host_resolver(new MockHostResolver), proxy_service(ProxyService::CreateNull()), ssl_config_service(new SSLConfigServiceDefaults), - http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault()) {} + http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault()), + spdy_session_pool(new SpdySessionPool) {} // Custom proxy service dependency. explicit SessionDependencies(ProxyService* proxy_service) : host_resolver(new MockHostResolver), proxy_service(proxy_service), ssl_config_service(new SSLConfigServiceDefaults), - http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault()) {} + http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault()), + spdy_session_pool(new SpdySessionPool) {} scoped_refptr<MockHostResolverBase> host_resolver; scoped_refptr<ProxyService> proxy_service; scoped_refptr<SSLConfigService> ssl_config_service; MockClientSocketFactory socket_factory; scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory; + scoped_refptr<SpdySessionPool> spdy_session_pool; }; ProxyService* CreateFixedProxyService(const std::string& proxy) { @@ -110,6 +113,7 @@ HttpNetworkSession* CreateSession(SessionDependencies* session_deps) { session_deps->proxy_service, &session_deps->socket_factory, session_deps->ssl_config_service, + session_deps->spdy_session_pool, session_deps->http_auth_handler_factory.get()); } @@ -235,7 +239,8 @@ class CaptureGroupNameSocketPool : public EmulatedClientSocketPool { public: CaptureGroupNameSocketPool(HttpNetworkSession* session) : EmulatedClientSocketPool(0, 0, "CaptureGroupNameTestPool", - session->host_resolver(), NULL) {} + session->host_resolver(), NULL, + NULL) {} const std::string last_group_name_received() const { return last_group_name_; } |