Flush socket pools and SPDY session pool properly on explicit requests and network changes.

BUG=40455,40457

Review URL: http://codereview.chromium.org/1615005

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

1 files changed, 2 insertions, 6 deletions

diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 068b276..8a22514 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -12,7 +12,6 @@
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_network_transaction.h"
 #include "net/spdy/spdy_session.h"
-#include "net/spdy/spdy_session_pool.h"
 
 namespace net {
 
@@ -57,7 +56,6 @@ HttpNetworkLayer::HttpNetworkLayer(
       proxy_service_(proxy_service),
       ssl_config_service_(ssl_config_service),
       session_(NULL),
-      spdy_session_pool_(NULL),
       http_auth_handler_factory_(http_auth_handler_factory),
       suspended_(false) {
   DCHECK(proxy_service_);
@@ -69,7 +67,6 @@ HttpNetworkLayer::HttpNetworkLayer(HttpNetworkSession* session)
       network_change_notifier_(NULL),
       ssl_config_service_(NULL),
       session_(session),
-      spdy_session_pool_(session->spdy_session_pool()),
       http_auth_handler_factory_(NULL),
       suspended_(false) {
   DCHECK(session_.get());
@@ -97,16 +94,15 @@ void HttpNetworkLayer::Suspend(bool suspend) {
   suspended_ = suspend;
 
   if (suspend && session_)
-    session_->tcp_socket_pool()->CloseIdleSockets();
+    session_->Flush();
 }
 
 HttpNetworkSession* HttpNetworkLayer::GetSession() {
   if (!session_) {
     DCHECK(proxy_service_);
-    SpdySessionPool* spdy_pool = new SpdySessionPool;
     session_ = new HttpNetworkSession(
         network_change_notifier_, host_resolver_, proxy_service_,
-        socket_factory_, ssl_config_service_, spdy_pool,
+        socket_factory_, ssl_config_service_,
         http_auth_handler_factory_);
     // These were just temps for lazy-initializing HttpNetworkSession.
     network_change_notifier_ = NULL;