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

net/spdy/spdy_http_stream_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_http_stream.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
@@ skipping 798 matching lines @@
   socket_factory->AddSSLSocketDataProvider(&ssl);
   http_session_ = SpdySessionDependencies::SpdyCreateSessionDeterministic(
       &session_deps_);
   session_ = http_session_->spdy_session_pool()->Get(pair, BoundNetLog());
   transport_params_ = new TransportSocketParams(host_port_pair,
                                                 MEDIUM, false, false,
                                                 OnHostResolutionCallback());
   TestCompletionCallback callback;
   scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
   SSLConfig ssl_config;
-  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,
-                          host_port_pair,
-                          ssl_config,
-                          0,
-                          false,
-                          false));
+  scoped_refptr<SSLSocketParams> ssl_params =
+      SSLSocketParams::CreateForDirectConnection(
+          transport_params_,
+          host_port_pair,
+          ssl_config,
+          0,
+          false,
+          false);
   EXPECT_EQ(ERR_IO_PENDING,
             connection->Init(host_port_pair.ToString(),
                              ssl_params,
                              MEDIUM,
                              callback.callback(),
                              http_session_->GetSSLSocketPool(
                                  HttpNetworkSession::NORMAL_SOCKET_POOL),
                              BoundNetLog()));
   callback.WaitForResult();
   EXPECT_EQ(OK,
@@ skipping 60 matching lines @@
 
   sequenced_worker_pool->Shutdown();
 }
 
 #endif  // !defined(USE_OPENSSL)
 
 // TODO(willchan): Write a longer test for SpdyStream that exercises all
 // methods.
 
 }  // namespace net