Reland 61015 (unnecessary revert due to flaky build) - 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

TBR=willchan@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61063 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 3d1211c..1ee0bc5 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -105,9 +105,7 @@ 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_; }
-  const scoped_refptr<SpdySessionPool>& spdy_session_pool() {
-    return spdy_session_pool_;
-  }
+  SpdySessionPool* spdy_session_pool() { return spdy_session_pool_.get(); }
   HttpAuthHandlerFactory* http_auth_handler_factory() {
     return http_auth_handler_factory_;
   }
@@ -143,7 +141,9 @@ class HttpNetworkSession : public base::RefCounted<HttpNetworkSession>,
   scoped_refptr<ProxyService> proxy_service_;
   scoped_refptr<SSLConfigService> ssl_config_service_;
   ClientSocketPoolManager socket_pool_manager_;
-  scoped_refptr<SpdySessionPool> spdy_session_pool_;
+  // TODO(willchan): Move this out to IOThread so it can be shared across
+  // URLRequestContexts.
+  scoped_ptr<SpdySessionPool> spdy_session_pool_;
   scoped_refptr<HttpStreamFactory> http_stream_factory_;
   HttpAuthHandlerFactory* http_auth_handler_factory_;
   HttpNetworkDelegate* const network_delegate_;