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-10-16 00:49:00 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-16 00:49:00 +0000
commit81cdfcd5d551d8d581952a27ae968803ad856a39 (patch)
tree6f3806fb275ea36dddd43bd9d6efff96a93a2c77 /net/http/http_network_session.h
parentd770c84f903bd2058e33c6635c553f22c455efd3 (diff)
downloadchromium_src-81cdfcd5d551d8d581952a27ae968803ad856a39.zip
chromium_src-81cdfcd5d551d8d581952a27ae968803ad856a39.tar.gz
chromium_src-81cdfcd5d551d8d581952a27ae968803ad856a39.tar.bz2
Plumb up the preconnect logic from pools to StreamFactory.
BUG=54450 TEST=none Review URL: http://codereview.chromium.org/3750009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_session.h')
-rw-r--r--net/http/http_network_session.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index e23ecd6..bf5e98b 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -116,8 +116,8 @@ class HttpNetworkSession : public base::RefCounted<HttpNetworkSession>,
return network_delegate_;
}
- const scoped_refptr<HttpStreamFactory>& http_stream_factory() {
- return http_stream_factory_;
+ HttpStreamFactory* http_stream_factory() {
+ return &http_stream_factory_;
}
// Creates a Value summary of the state of the socket pools. The caller is
@@ -152,7 +152,7 @@ class HttpNetworkSession : public base::RefCounted<HttpNetworkSession>,
// 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_;
+ HttpStreamFactory http_stream_factory_;
HttpAuthHandlerFactory* http_auth_handler_factory_;
HttpNetworkDelegate* const network_delegate_;
NetLog* net_log_;