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

net/http/http_proxy_client_socket_pool_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/http/http_proxy_client_socket_pool.h"
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 36 matching lines @@
  protected:
   HttpProxyClientSocketPoolSpdy2Test()
       : ssl_config_(),
         ignored_transport_socket_params_(
             new TransportSocketParams(HostPortPair("proxy", 80),
                                       LOWEST,
                                       false,
                                       false,
                                       OnHostResolutionCallback())),
         ignored_ssl_socket_params_(
-            new SSLSocketParams(ignored_transport_socket_params_,
-                                NULL,
-                                NULL,
-                                ProxyServer::SCHEME_DIRECT,
-                                HostPortPair("www.google.com", 443),
-                                ssl_config_,
-                                0,
-                                false,
-                                false)),
+            SSLSocketParams::CreateForDirectConnection(
+                ignored_transport_socket_params_,
+                HostPortPair("www.google.com", 443),
+                ssl_config_,
+                0,
+                false,
+                false)),
         tcp_histograms_("MockTCP"),
         transport_socket_pool_(
             kMaxSockets,
             kMaxSocketsPerGroup,
             &tcp_histograms_,
             session_deps_.deterministic_socket_factory.get()),
         ssl_histograms_("MockSSL"),
         ssl_socket_pool_(kMaxSockets,
                          kMaxSocketsPerGroup,
                          &ssl_histograms_,
@@ skipping 523 matching lines @@
     // Make sure Location header was included and correct.
     std::string location;
     EXPECT_TRUE(headers->IsRedirect(&location));
     EXPECT_EQ(location, redirectTarget);
   }
 }
 
 // It would be nice to also test the timeouts in HttpProxyClientSocketPool.
 
 }  // namespace net