Revert r47395. Looks like it still crashes =/

net/http/http_network_session.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_network_session.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 17 matching lines @@
 // The max number of sockets to allow per proxy server.  This applies both to
 // http and SOCKS proxies.  See http://crbug.com/12066 for details about proxy
 // server connection limits.
 int g_max_sockets_per_proxy_server = 15;
 
 uint16 g_fixed_http_port = 0;
 uint16 g_fixed_https_port = 0;
 
 }  // namespace
 
+// TODO(vandebo) when we've completely converted to pools, the base TCP
+// pool name should get changed to TCP instead of Transport.
 HttpNetworkSession::HttpNetworkSession(
     NetworkChangeNotifier* network_change_notifier,
     HostResolver* host_resolver,
     ProxyService* proxy_service,
     ClientSocketFactory* client_socket_factory,
     SSLConfigService* ssl_config_service,
+    SpdySessionPool* spdy_session_pool,
     HttpAuthHandlerFactory* http_auth_handler_factory)
     : network_change_notifier_(network_change_notifier),
+      tcp_socket_pool_(new TCPClientSocketPool(
+          g_max_sockets, g_max_sockets_per_group, "Transport",
+          host_resolver, client_socket_factory, network_change_notifier_)),
       socket_factory_(client_socket_factory),
       host_resolver_(host_resolver),
-      tcp_socket_pool_(CreateNewTCPSocketPool()),
       proxy_service_(proxy_service),
       ssl_config_service_(ssl_config_service),
-      spdy_session_pool_(new SpdySessionPool),
+      spdy_session_pool_(spdy_session_pool),
       http_auth_handler_factory_(http_auth_handler_factory) {
   DCHECK(proxy_service);
   DCHECK(ssl_config_service);
-
-  if (network_change_notifier_)
-    network_change_notifier_->AddObserver(this);
 }
 
 HttpNetworkSession::~HttpNetworkSession() {
-  if (network_change_notifier_)
-    network_change_notifier_->RemoveObserver(this);
-}
-
-void HttpNetworkSession::OnIPAddressChanged() {
-  Flush();
-}
-
-void HttpNetworkSession::Flush() {
-  // TODO(willchan): Flush |host_resolver_|.
-  tcp_socket_pool()->CloseIdleSockets();
-  tcp_socket_pool_ = CreateNewTCPSocketPool();
-  for (HTTPProxySocketPoolMap::iterator it = http_proxy_socket_pool_.begin();
-       it != http_proxy_socket_pool_.end(); ++it)
-    it->second->CloseIdleSockets();
-  http_proxy_socket_pool_.clear();
-  for (SOCKSSocketPoolMap::iterator it = socks_socket_pool_.begin();
-       it != socks_socket_pool_.end(); ++it)
-    it->second->CloseIdleSockets();
-  socks_socket_pool_.clear();
-  spdy_session_pool_ = new SpdySessionPool;
-}
-
-scoped_refptr<TCPClientSocketPool>
-HttpNetworkSession::CreateNewTCPSocketPool() {
-  // TODO(vandebo) when we've completely converted to pools, the base TCP
-  // pool name should get changed to TCP instead of Transport.
-  return new TCPClientSocketPool(g_max_sockets,
-                                 g_max_sockets_per_group,
-                                 "Transport",
-                                 host_resolver_,
-                                 socket_factory_);
 }
 
 const scoped_refptr<TCPClientSocketPool>&
 HttpNetworkSession::GetSocketPoolForHTTPProxy(const HostPortPair& http_proxy) {
   HTTPProxySocketPoolMap::const_iterator it =
       http_proxy_socket_pool_.find(http_proxy);
   if (it != http_proxy_socket_pool_.end())
     return it->second;
 
   std::pair<HTTPProxySocketPoolMap::iterator, bool> ret =
       http_proxy_socket_pool_.insert(
           std::make_pair(
               http_proxy,
               new TCPClientSocketPool(
                   g_max_sockets_per_proxy_server, g_max_sockets_per_group,
-                  "HTTPProxy", host_resolver_, socket_factory_)));
+                  "HTTPProxy", host_resolver_, socket_factory_,
+                  network_change_notifier_)));
 
   return ret.first->second;
 }
 
 const scoped_refptr<SOCKSClientSocketPool>&
 HttpNetworkSession::GetSocketPoolForSOCKSProxy(
     const HostPortPair& socks_proxy) {
   SOCKSSocketPoolMap::const_iterator it = socks_socket_pool_.find(socks_proxy);
   if (it != socks_socket_pool_.end())
     return it->second;
 
   std::pair<SOCKSSocketPoolMap::iterator, bool> ret =
       socks_socket_pool_.insert(
           std::make_pair(
               socks_proxy,
               new SOCKSClientSocketPool(
                   g_max_sockets_per_proxy_server, g_max_sockets_per_group,
                   "SOCKS", host_resolver_,
                   new TCPClientSocketPool(g_max_sockets_per_proxy_server,
                                           g_max_sockets_per_group,
                                           "TCPForSOCKS", host_resolver_,
-                                          socket_factory_))));
+                                          socket_factory_,
+                                          network_change_notifier_),
+                  network_change_notifier_)));
 
   return ret.first->second;
 }
 
 // static
 void HttpNetworkSession::set_max_sockets_per_group(int socket_count) {
   DCHECK_LT(0, socket_count);
   // The following is a sanity check... but we should NEVER be near this value.
   DCHECK_GT(100, socket_count);
   g_max_sockets_per_group = socket_count;
@@ skipping 12 matching lines @@
 // static
 uint16 HttpNetworkSession::fixed_https_port() {
   return g_fixed_https_port;
 }
 
 // static
 void HttpNetworkSession::set_fixed_https_port(uint16 port) {
   g_fixed_https_port = port;
 }
 
+// TODO(vandebo) when we've completely converted to pools, the base TCP
+// pool name should get changed to TCP instead of Transport.
+void HttpNetworkSession::ReplaceTCPSocketPool() {
+  tcp_socket_pool_ = new TCPClientSocketPool(g_max_sockets,
+                                             g_max_sockets_per_group,
+                                             "Transport",
+                                             host_resolver_,
+                                             socket_factory_,
+                                             network_change_notifier_);
+}
+
 }  //  namespace net