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

1 files changed, 6 insertions, 4 deletions

diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index e98a478..2894471 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -39,9 +39,9 @@ namespace net {
 const int kMss = 1430;
 const int kMaxSpdyFrameChunkSize = (2 * kMss) - spdy::SpdyFrame::size();
 
-class SpdyStream;
-class HttpNetworkSession;
 class BoundNetLog;
+class SpdySettingsStorage;
+class SpdyStream;
 class SSLInfo;
 
 class SpdySession : public base::RefCounted<SpdySession>,
@@ -53,7 +53,8 @@ class SpdySession : public base::RefCounted<SpdySession>,
   // |session| is the HttpNetworkSession.  |net_log| is the NetLog that we log
   // network events to.
   SpdySession(const HostPortProxyPair& host_port_proxy_pair,
-              HttpNetworkSession* session,
+              SpdySessionPool* spdy_session_pool,
+              SpdySettingsStorage* spdy_settings,
               NetLog* net_log);
 
   const HostPortPair& host_port_pair() const {
@@ -286,7 +287,8 @@ class SpdySession : public base::RefCounted<SpdySession>,
   // The domain this session is connected to.
   const HostPortProxyPair host_port_proxy_pair_;
 
-  scoped_refptr<HttpNetworkSession> session_;
+  scoped_refptr<SpdySessionPool> spdy_session_pool_;
+  SpdySettingsStorage* spdy_settings_;
 
   // The socket handle for this session.
   scoped_ptr<ClientSocketHandle> connection_;