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

net/spdy/spdy_session_spdy3_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/spdy/spdy_session.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/io_buffer.h"
@@ skipping 1335 matching lines @@
 
   scoped_refptr<SpdySession> session = GetSession(pair_);
 
   SSLConfig ssl_config;
   scoped_refptr<TransportSocketParams> transport_params(
       new TransportSocketParams(test_host_port_pair_,
                                 MEDIUM,
                                 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(),
                                  http_session_->GetSSLSocketPool(
                                      HttpNetworkSession::NORMAL_SOCKET_POOL),
                                  BoundNetLog()));
 
   EXPECT_EQ(OK, session->InitializeWithSocket(connection.release(), false, OK));
   EXPECT_TRUE(session->VerifyDomainAuthentication("www.example.org"));
   EXPECT_TRUE(session->VerifyDomainAuthentication("mail.example.org"));
@@ skipping 37 matching lines @@
 
   scoped_refptr<SpdySession> session = GetSession(pair_);
 
   SSLConfig ssl_config;
   scoped_refptr<TransportSocketParams> transport_params(
       new TransportSocketParams(test_host_port_pair_,
                                 MEDIUM,
                                 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(),
                                  http_session_->GetSSLSocketPool(
                                      HttpNetworkSession::NORMAL_SOCKET_POOL),
                                  BoundNetLog()));
 
   EXPECT_EQ(OK, session->InitializeWithSocket(connection.release(), false, OK));
   EXPECT_TRUE(session->VerifyDomainAuthentication("www.example.org"));
   EXPECT_TRUE(session->VerifyDomainAuthentication("mail.example.org"));
@@ skipping 214 matching lines @@
 
   scoped_refptr<SpdySession> session = GetSession(pair);
 
   SSLConfig ssl_config;
   scoped_refptr<TransportSocketParams> transport_params(
       new TransportSocketParams(test_host_port_pair,
                                 MEDIUM,
                                 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(),
                                  http_session_->GetSSLSocketPool(
                                      HttpNetworkSession::NORMAL_SOCKET_POOL),
                                  BoundNetLog()));
 
   EXPECT_EQ(OK, session->InitializeWithSocket(connection.release(), true, OK));
 
   EXPECT_TRUE(session->NeedsCredentials());
@@ skipping 34 matching lines @@
 
   SSLConfig ssl_config;
   scoped_refptr<TransportSocketParams> transport_params(
       new TransportSocketParams(test_host_port_pair,
                                 MEDIUM,
                                 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(),
                                  http_session_->GetSSLSocketPool(
                                      HttpNetworkSession::NORMAL_SOCKET_POOL),
                                  BoundNetLog()));
 
   EXPECT_EQ(OK, session->InitializeWithSocket(connection.release(), true, OK));
   EXPECT_TRUE(session->NeedsCredentials());
 
@@ skipping 1595 matching lines @@
   EXPECT_EQ(0, delegate1.body_data_sent());
 
   EXPECT_TRUE(delegate2.send_headers_completed());
   EXPECT_EQ("200", delegate2.GetResponseHeaderValue(":status"));
   EXPECT_EQ("HTTP/1.1", delegate2.GetResponseHeaderValue(":version"));
   EXPECT_EQ(std::string(), delegate2.TakeReceivedData());
   EXPECT_EQ(0, delegate2.body_data_sent());
 }
 
 }  // namespace net