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

net/spdy/spdy_session_spdy3_unittest.cc

Index: net/spdy/spdy_session_spdy3_unittest.cc
diff --git a/net/spdy/spdy_session_spdy3_unittest.cc b/net/spdy/spdy_session_spdy3_unittest.cc
index fcbe0ab89797acf9ecd03c0f10c6a12651aa0884..a603b312277974e8429250d2b8961a7b9807045f 100644
--- a/net/spdy/spdy_session_spdy3_unittest.cc
+++ b/net/spdy/spdy_session_spdy3_unittest.cc
@@ -1353,18 +1353,14 @@ TEST_F(SpdySessionSpdy3Test, 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(),
@@ -1422,18 +1418,14 @@ TEST_F(SpdySessionSpdy3Test, 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(),
@@ -1668,18 +1660,14 @@ TEST_F(SpdySessionSpdy3Test, 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(),
@@ -1734,16 +1722,14 @@ TEST_F(SpdySessionSpdy3Test, SendCredentials) {
                                 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(),