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

net/socket/ssl_client_socket_pool_unittest.cc

Index: net/socket/ssl_client_socket_pool_unittest.cc
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index fe7e3d25fe2d5a05d625957a8d5beb517767bb80..008ae0abd9deba3d498acf8ce980a689f260f567 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -153,17 +153,43 @@ class SSLClientSocketPoolTest : public testing::Test {
 
   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() {