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

net/spdy/spdy_session_spdy2_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/memory/scoped_ptr.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_log_unittest.h"
@@ skipping 1219 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 227 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_FALSE(session->NeedsCredentials());
@@ skipping 400 matching lines @@
       http_session_.get(), session.get(), test_host_port_pair_);
 
   EXPECT_EQ(SpdySession::FLOW_CONTROL_NONE, session->flow_control_state());
   EXPECT_EQ(kSpdyVersion2, session->buffered_spdy_framer_->protocol_version());
   EXPECT_EQ(0, session->session_send_window_size_);
   EXPECT_EQ(0, session->session_recv_window_size_);
   EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
 }
 
 }  // namespace net