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

net/socket/ssl_client_socket_pool_unittest.cc

 // 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.
 
 #include "net/http/http_proxy_client_socket_pool.h"
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 135 matching lines @@
         &socket_factory_,
         transport_pool ? &transport_socket_pool_ : NULL,
         socks_pool ? &socks_socket_pool_ : NULL,
         http_proxy_pool ? &http_proxy_socket_pool_ : NULL,
         NULL,
         NULL));
   }
 
   scoped_refptr<SSLSocketParams> SSLParams(ProxyServer::Scheme proxy,
                                            bool want_spdy_over_npn) {
-    return make_scoped_refptr(new SSLSocketParams(
-        proxy == ProxyServer::SCHEME_DIRECT ?
-            direct_transport_socket_params_ : NULL,
-        proxy == ProxyServer::SCHEME_SOCKS5 ? socks_socket_params_ : NULL,
-        proxy == ProxyServer::SCHEME_HTTP ? http_proxy_socket_params_ : NULL,
-        proxy,
-        HostPortPair("host", 443),
-        ssl_config_,
-        0,
-        false,
-        want_spdy_over_npn));
+    HostPortPair host_port("host", 443);
+
+    switch(proxy) {
+      case ProxyServer::SCHEME_DIRECT:
+        return SSLSocketParams::CreateForDirectConnection(
+            direct_transport_socket_params_,
+            host_port,
+            ssl_config_,
+            0,
+            false,
+            want_spdy_over_npn);
+
+      case ProxyServer::SCHEME_HTTP:
+        return SSLSocketParams::CreateForHttpProxy(
+            http_proxy_socket_params_,
+            ProxyServer::SCHEME_HTTP,
+            host_port,
+            ssl_config_,
+            0,
+            false,
+            want_spdy_over_npn);
+
+      case ProxyServer::SCHEME_SOCKS5:
+        return SSLSocketParams::CreateForSocksProxy(
+            socks_socket_params_,
+            ProxyServer::SCHEME_SOCKS5,
+            host_port,
+            ssl_config_,
+            0,
+            false,
+            want_spdy_over_npn);
+
+      default:
+        LOG(DFATAL) << "unexpected proxy type";
+        NOTREACHED();
+        return NULL;
+    }
   }
 
   void AddAuthToCache() {
     const base::string16 kFoo(ASCIIToUTF16("foo"));
     const base::string16 kBar(ASCIIToUTF16("bar"));
     session_->http_auth_cache()->Add(GURL("http://proxy:443/"),
                                      "MyRealm1",
                                      HttpAuth::AUTH_SCHEME_BASIC,
                                      "Basic realm=MyRealm1",
                                      AuthCredentials(kFoo, kBar),
@@ skipping 715 matching lines @@
   ssl.channel_id_sent = true;
   ssl.SetNextProto(kProtoSPDY2);
   TestIPPoolingDisabled(&ssl);
 }
 
 // It would be nice to also test the timeouts in SSLClientSocketPool.
 
 }  // namespace
 
 }  // namespace net