Change ClientSocketPoolManager::InitSocketHandleForHttpRequest and friends

net/socket/client_socket_pool_manager.h

Index: net/socket/client_socket_pool_manager.h
diff --git a/net/socket/client_socket_pool_manager.h b/net/socket/client_socket_pool_manager.h
index 12154809870240577c0faaa17ede820f7f7ad0b8..bab8268bc533f70b29afd401cfa6e0cf4f6dbaa3 100644
--- a/net/socket/client_socket_pool_manager.h
+++ b/net/socket/client_socket_pool_manager.h
@@ -44,6 +44,11 @@ enum DefaultMaxValues { kDefaultMaxSocketsPerProxyServer = 32 };
 
 class NET_EXPORT_PRIVATE ClientSocketPoolManager {
  public:
+  enum SocketGroupType { NORMAL_GROUP, SSL_GROUP, FTP_GROUP };

[mmenke, 2015/04/07 16:36:58]

It's not clear what a group type is, particular with force_spdy_over_ssl
muddying the waters.  Should document it.

[Ryan Hamilton, 2015/04/07 19:07:31]

Done. Hopefully this helps. now that the force_spdy wart has been removed, this
should hopefully be self explanatory?

+
+  // Returns the correct socket group type for |scheme|.
+  static SocketGroupType GroupTypeFromScheme(const std::string& scheme);
+
   ClientSocketPoolManager();
   virtual ~ClientSocketPoolManager();
 
@@ -90,7 +95,8 @@ class NET_EXPORT_PRIVATE ClientSocketPoolManager {
 // resolved.  If |resolution_callback| does not return OK, then the
 // connection will be aborted with that value.
 int InitSocketHandleForHttpRequest(
-    const GURL& request_url,
+    ClientSocketPoolManager::SocketGroupType group_type,
+    const HostPortPair& endpoint,
     const HttpRequestHeaders& request_extra_headers,
     int request_load_flags,
     RequestPriority request_priority,
@@ -116,7 +122,8 @@ int InitSocketHandleForHttpRequest(
 // connection will be aborted with that value.
 // This function uses WEBSOCKET_SOCKET_POOL socket pools.
 int InitSocketHandleForWebSocketRequest(
-    const GURL& request_url,
+    ClientSocketPoolManager::SocketGroupType group_type,
+    const HostPortPair& endpoint,
     const HttpRequestHeaders& request_extra_headers,
     int request_load_flags,
     RequestPriority request_priority,
@@ -165,7 +172,8 @@ NET_EXPORT int InitSocketHandleForTlsConnect(
 // Similar to InitSocketHandleForHttpRequest except that it initiates the
 // desired number of preconnect streams from the relevant socket pool.
 int PreconnectSocketsForHttpRequest(
-    const GURL& request_url,
+    ClientSocketPoolManager::SocketGroupType group_type,
+    const HostPortPair& endpoint,
     const HttpRequestHeaders& request_extra_headers,
     int request_load_flags,
     RequestPriority request_priority,