diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 00:30:12 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 00:30:12 +0000 |
| commit | 13eae8ce32b768450bdda9af60bd791491a5fd82 (patch) | |
| tree | 81dfd2b600b24ead8afe9547b909333f4252df79 /net/spdy/spdy_test_util.h | |
| parent | 1e721f5632a5eddfba9730f367f18d0befe0463d (diff) | |
| download | chromium_src-13eae8ce32b768450bdda9af60bd791491a5fd82.zip chromium_src-13eae8ce32b768450bdda9af60bd791491a5fd82.tar.gz chromium_src-13eae8ce32b768450bdda9af60bd791491a5fd82.tar.bz2 | |
Stop refcounting SpdySessionPool.
BUG=57343
TEST=none
Review URL: http://codereview.chromium.org/3602001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_test_util.h')
| -rw-r--r-- | net/spdy/spdy_test_util.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/spdy/spdy_test_util.h b/net/spdy/spdy_test_util.h index be2f7d0..13b3a2f 100644 --- a/net/spdy/spdy_test_util.h +++ b/net/spdy/spdy_test_util.h @@ -304,8 +304,7 @@ class SpdySessionDependencies { socket_factory(new MockClientSocketFactory), deterministic_socket_factory(new DeterministicMockClientSocketFactory), http_auth_handler_factory( - HttpAuthHandlerFactory::CreateDefault(host_resolver)), - spdy_session_pool(new SpdySessionPool(NULL)) { + HttpAuthHandlerFactory::CreateDefault(host_resolver)) { // Note: The CancelledTransaction test does cleanup by running all // tasks in the message loop (RunAllPending). Unfortunately, that // doesn't clean up tasks on the host resolver thread; and @@ -323,8 +322,7 @@ class SpdySessionDependencies { socket_factory(new MockClientSocketFactory), deterministic_socket_factory(new DeterministicMockClientSocketFactory), http_auth_handler_factory( - HttpAuthHandlerFactory::CreateDefault(host_resolver)), - spdy_session_pool(new SpdySessionPool(NULL)) {} + HttpAuthHandlerFactory::CreateDefault(host_resolver)) {} // NOTE: host_resolver must be ordered before http_auth_handler_factory. scoped_refptr<MockHostResolverBase> host_resolver; @@ -333,7 +331,6 @@ class SpdySessionDependencies { scoped_ptr<MockClientSocketFactory> socket_factory; scoped_ptr<DeterministicMockClientSocketFactory> deterministic_socket_factory; scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory; - scoped_refptr<SpdySessionPool> spdy_session_pool; static HttpNetworkSession* SpdyCreateSession( SpdySessionDependencies* session_deps) { @@ -341,7 +338,7 @@ class SpdySessionDependencies { session_deps->proxy_service, session_deps->socket_factory.get(), session_deps->ssl_config_service, - session_deps->spdy_session_pool, + new SpdySessionPool(NULL), session_deps->http_auth_handler_factory.get(), NULL, NULL); @@ -353,7 +350,7 @@ class SpdySessionDependencies { session_deps-> deterministic_socket_factory.get(), session_deps->ssl_config_service, - session_deps->spdy_session_pool, + new SpdySessionPool(NULL), session_deps->http_auth_handler_factory.get(), NULL, NULL); @@ -365,7 +362,6 @@ class SpdyURLRequestContext : public URLRequestContext { SpdyURLRequestContext() { host_resolver_ = new MockHostResolver; proxy_service_ = ProxyService::CreateDirect(); - spdy_session_pool_ = new SpdySessionPool(NULL); ssl_config_service_ = new SSLConfigServiceDefaults; http_auth_handler_factory_ = HttpAuthHandlerFactory::CreateDefault( host_resolver_); @@ -374,7 +370,7 @@ class SpdyURLRequestContext : public URLRequestContext { host_resolver_, proxy_service_, ssl_config_service_, - spdy_session_pool_.get(), + new SpdySessionPool(NULL), http_auth_handler_factory_, network_delegate_, NULL), @@ -391,7 +387,6 @@ class SpdyURLRequestContext : public URLRequestContext { private: MockClientSocketFactory socket_factory_; - scoped_refptr<SpdySessionPool> spdy_session_pool_; }; const SpdyHeaderInfo make_spdy_header(spdy::SpdyControlType type); |