Merge 21276 - Limit total number of sockets in the system....

net/http/http_network_session.h

Index: net/http/http_network_session.h
===================================================================
--- net/http/http_network_session.h	(revision 22877)
+++ net/http/http_network_session.h	(working copy)
@@ -5,7 +5,6 @@
 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
 
-#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "net/base/ssl_client_auth_cache.h"
 #include "net/base/ssl_config_service.h"
@@ -22,13 +21,7 @@
 class HttpNetworkSession : public base::RefCounted<HttpNetworkSession> {
  public:
   HttpNetworkSession(HostResolver* host_resolver, ProxyService* proxy_service,
-                     ClientSocketFactory* client_socket_factory)
-      : connection_pool_(new TCPClientSocketPool(
-            max_sockets_per_group_, host_resolver, client_socket_factory)),
-        host_resolver_(host_resolver),
-        proxy_service_(proxy_service) {
-    DCHECK(proxy_service);
-  }
+                     ClientSocketFactory* client_socket_factory);
 
   HttpAuthCache* auth_cache() { return &auth_cache_; }
   SSLClientAuthCache* ssl_client_auth_cache() {
@@ -46,6 +39,9 @@
  private:
   FRIEND_TEST(HttpNetworkTransactionTest, GroupNameForProxyConnections);
 
+  // Total limit of sockets. Not a constant to allow experiments.
+  static int max_sockets_;
+
   // Default to allow up to 6 connections per host. Experiment and tuning may
   // try other values (greater than 0).  Too large may cause many problems, such
   // as home routers blocking the connections!?!?
Property changes on: net\http\http_network_session.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/net/http/http_network_session.h:r21276