Refactor pooled socket request code to prepare for implementation of pretend-to-preconnect.

net/socket/ssl_client_socket_pool.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 31 matching lines @@
   SSLSocketParams(const scoped_refptr<TransportSocketParams>& transport_params,
                   const scoped_refptr<SOCKSSocketParams>& socks_params,
                   const scoped_refptr<HttpProxySocketParams>& http_proxy_params,
                   ProxyServer::Scheme proxy,
                   const HostPortPair& host_and_port,
                   const SSLConfig& ssl_config,
                   int load_flags,
                   bool force_spdy_over_ssl,
                   bool want_spdy_over_npn);
 
+  SSLSocketParams(const scoped_refptr<TransportSocketParams>& transport_params,

[mmenke, 2013/04/29 16:15:46]

I think this is actually worse than the old code.  Using overloaded functions
obscures the fact that different constructors are being called.  The Google
style guide also discourages overloading.

If we go this route, my suggestion is to make these static functions with
different names that call into it.

e.g.:

SSLSocketParams::CreateForDirectConnection()

SSLSocketParams::CreateForHttpProxy()

SSLSocketParams::CreateForSocksProxy()



We should also make the old constructor private.

[kouhei (in TOK), 2013/04/30 01:38:33]

Made static factory methods.

+                  const HostPortPair& host_and_port,
+                  const SSLConfig& ssl_config,
+                  int load_flags,
+                  bool force_spdy_over_ssl,
+                  bool want_spdy_over_npn);
+
+  SSLSocketParams(const scoped_refptr<HttpProxySocketParams>& http_proxy_params,
+                  ProxyServer::Scheme proxy,
+                  const HostPortPair& host_and_port,
+                  const SSLConfig& ssl_config,
+                  int load_flags,
+                  bool force_spdy_over_ssl,
+                  bool want_spdy_over_npn);
+
+  SSLSocketParams(const scoped_refptr<SOCKSSocketParams>& socks_params_,
+                  ProxyServer::Scheme proxy,
+                  const HostPortPair& host_and_port,
+                  const SSLConfig& ssl_config,
+                  int load_flags,
+                  bool force_spdy_over_ssl,
+                  bool want_spdy_over_npn);
+
   const scoped_refptr<TransportSocketParams>& transport_params() {
       return transport_params_;
   }
   const scoped_refptr<HttpProxySocketParams>& http_proxy_params() {
     return http_proxy_params_;
   }
   const scoped_refptr<SOCKSSocketParams>& socks_params() {
     return socks_params_;
   }
   ProxyServer::Scheme proxy() const { return proxy_; }
@@ skipping 222 matching lines @@
   const scoped_refptr<SSLConfigService> ssl_config_service_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool);
 };
 
 REGISTER_SOCKET_PARAMS_FOR_POOL(SSLClientSocketPool, SSLSocketParams);
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_