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

net/spdy/spdy_session_spdy2_unittest.cc

Index: net/spdy/spdy_session_spdy2_unittest.cc
diff --git a/net/spdy/spdy_session_spdy2_unittest.cc b/net/spdy/spdy_session_spdy2_unittest.cc
index 0978f0671e55cb346e7ca85504016ef34950ef10..43e5ac73b3bcb4890aa777dabe3138c6c4a7cca7 100644
--- a/net/spdy/spdy_session_spdy2_unittest.cc
+++ b/net/spdy/spdy_session_spdy2_unittest.cc
@@ -1237,18 +1237,14 @@ TEST_F(SpdySessionSpdy2Test, VerifyDomainAuthentication) {
                                 false,
                                 false,
                                 OnHostResolutionCallback()));
-  scoped_refptr<SOCKSSocketParams> socks_params;
-  scoped_refptr<HttpProxySocketParams> http_proxy_params;
-  scoped_refptr<SSLSocketParams> ssl_params(
-      new SSLSocketParams(transport_params,
-                          socks_params,
-                          http_proxy_params,
-                          ProxyServer::SCHEME_DIRECT,
-                          test_host_port_pair_,
-                          ssl_config,
-                          0,
-                          false,
-                          false));
+  scoped_refptr<SSLSocketParams> ssl_params =
+      SSLSocketParams::CreateForDirectConnection(
+          transport_params,
+          test_host_port_pair_,
+          ssl_config,
+          0,
+          false,
+          false);
   scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
   EXPECT_EQ(OK, connection->Init(test_host_port_pair_.ToString(),
                                  ssl_params, MEDIUM, CompletionCallback(),
@@ -1306,18 +1302,14 @@ TEST_F(SpdySessionSpdy2Test, ConnectionPooledWithTlsChannelId) {
                                 false,
                                 false,
                                 OnHostResolutionCallback()));
-  scoped_refptr<SOCKSSocketParams> socks_params;
-  scoped_refptr<HttpProxySocketParams> http_proxy_params;
-  scoped_refptr<SSLSocketParams> ssl_params(
-      new SSLSocketParams(transport_params,
-                          socks_params,
-                          http_proxy_params,
-                          ProxyServer::SCHEME_DIRECT,
-                          test_host_port_pair_,
-                          ssl_config,
-                          0,
-                          false,
-                          false));
+  scoped_refptr<SSLSocketParams> ssl_params =
+      SSLSocketParams::CreateForDirectConnection(
+          transport_params,
+          test_host_port_pair_,
+          ssl_config,
+          0,
+          false,
+          false);
   scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
   EXPECT_EQ(OK, connection->Init(test_host_port_pair_.ToString(),
                                  ssl_params, MEDIUM, CompletionCallback(),
@@ -1565,18 +1557,14 @@ TEST_F(SpdySessionSpdy2Test, NeedsCredentials) {
                                 false,
                                 false,
                                 OnHostResolutionCallback()));
-  scoped_refptr<SOCKSSocketParams> socks_params;
-  scoped_refptr<HttpProxySocketParams> http_proxy_params;
-  scoped_refptr<SSLSocketParams> ssl_params(
-      new SSLSocketParams(transport_params,
-                          socks_params,
-                          http_proxy_params,
-                          ProxyServer::SCHEME_DIRECT,
-                          test_host_port_pair,
-                          ssl_config,
-                          0,
-                          false,
-                          false));
+  scoped_refptr<SSLSocketParams> ssl_params =
+      SSLSocketParams::CreateForDirectConnection(
+          transport_params,
+          test_host_port_pair,
+          ssl_config,
+          0,
+          false,
+          false);
   scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
   EXPECT_EQ(OK, connection->Init(test_host_port_pair.ToString(),
                                  ssl_params, MEDIUM, CompletionCallback(),