summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_session.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 00:57:13 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 00:57:13 +0000
commitb30241405fd188d9896843a84b52fea3f3c57828 (patch)
tree543603f753e8d878e513300cebe64083ddb20a4e /net/http/http_network_session.h
parent5f1361a76316abb12fb134308cca5fa84c38f776 (diff)
downloadchromium_src-b30241405fd188d9896843a84b52fea3f3c57828.zip
chromium_src-b30241405fd188d9896843a84b52fea3f3c57828.tar.gz
chromium_src-b30241405fd188d9896843a84b52fea3f3c57828.tar.bz2
Revert 61015 (broke fetch_client) - Stop refcounting SpdySessionPool.
BUG=57343 TEST=none Review URL: http://codereview.chromium.org/3602001 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/3541005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_session.h')
-rw-r--r--net/http/http_network_session.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 1ee0bc5..3d1211c 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -105,7 +105,9 @@ class HttpNetworkSession : public base::RefCounted<HttpNetworkSession>,
HostResolver* host_resolver() { return host_resolver_; }
ProxyService* proxy_service() { return proxy_service_; }
SSLConfigService* ssl_config_service() { return ssl_config_service_; }
- SpdySessionPool* spdy_session_pool() { return spdy_session_pool_.get(); }
+ const scoped_refptr<SpdySessionPool>& spdy_session_pool() {
+ return spdy_session_pool_;
+ }
HttpAuthHandlerFactory* http_auth_handler_factory() {
return http_auth_handler_factory_;
}
@@ -141,9 +143,7 @@ class HttpNetworkSession : public base::RefCounted<HttpNetworkSession>,
scoped_refptr<ProxyService> proxy_service_;
scoped_refptr<SSLConfigService> ssl_config_service_;
ClientSocketPoolManager socket_pool_manager_;
- // TODO(willchan): Move this out to IOThread so it can be shared across
- // URLRequestContexts.
- scoped_ptr<SpdySessionPool> spdy_session_pool_;
+ scoped_refptr<SpdySessionPool> spdy_session_pool_;
scoped_refptr<HttpStreamFactory> http_stream_factory_;
HttpAuthHandlerFactory* http_auth_handler_factory_;
HttpNetworkDelegate* const network_delegate_;