From f4580339db115c23098d09545db9c50a83e2e3e2 Mon Sep 17 00:00:00 2001 From: "rch@chromium.org" Date: Sat, 25 Sep 2010 21:20:27 +0000 Subject: Remove the references to HttpNetworkSession in SpdySession and replace it with a reference to the SpdySessionPool and SpdySettingStorage, which are actually required. Modified SpdySessionPool to take a pointer to SpdySettingsStorage instead of to HttpNetworkSession in both GetSpdySessionFromSocket() Get(). Modified HttpStreamRequest (and various unit tests) accordingly when calling these methods. Review URL: http://codereview.chromium.org/3400024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60590 0039d316-1c4b-4281-b951-d872f2087c98 --- net/spdy/spdy_session_pool.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'net/spdy/spdy_session_pool.h') diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h index 9d8d693..7dc5f27 100644 --- a/net/spdy/spdy_session_pool.h +++ b/net/spdy/spdy_session_pool.h @@ -30,6 +30,7 @@ class BoundNetLog; class ClientSocketHandle; class HttpNetworkSession; class SpdySession; +class SpdySettingsStorage; // This is a very simple pool for open SpdySessions. // TODO(mbelshe): Make this production ready. @@ -44,7 +45,7 @@ class SpdySessionPool // use. scoped_refptr Get( const HostPortProxyPair& host_port_proxy_pair, - HttpNetworkSession* session, + SpdySettingsStorage* spdy_settings, const BoundNetLog& net_log); // Set the maximum concurrent sessions per domain. @@ -65,7 +66,7 @@ class SpdySessionPool // Returns an error on failure, and |spdy_session| will be NULL. net::Error GetSpdySessionFromSocket( const HostPortProxyPair& host_port_proxy_pair, - HttpNetworkSession* session, + SpdySettingsStorage* spdy_settings, ClientSocketHandle* connection, const BoundNetLog& net_log, int certificate_error_code, -- cgit v1.1