Attempting to re-land CL 3110006 which turned out to have ...

net/socket/ssl_client_socket_pool_unittest.cc

 // Copyright (c) 2010 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/time.h"
@@ skipping 36 matching lines @@
         direct_tcp_socket_params_(new TCPSocketParams(
             HostPortPair("host", 443), MEDIUM, GURL(), false)),
         tcp_socket_pool_(new MockTCPClientSocketPool(
             kMaxSockets,
             kMaxSocketsPerGroup,
             make_scoped_refptr(new ClientSocketPoolHistograms("MockTCP")),
             &socket_factory_)),
         proxy_tcp_socket_params_(new TCPSocketParams(
             HostPortPair("proxy", 443), MEDIUM, GURL(), false)),
         http_proxy_socket_params_(new HttpProxySocketParams(
-            proxy_tcp_socket_params_, GURL("http://host"), "",
+            proxy_tcp_socket_params_, NULL, GURL("http://host"), "",
             HostPortPair("host", 80), session_, true)),
         http_proxy_socket_pool_(new HttpProxyClientSocketPool(
             kMaxSockets,
             kMaxSocketsPerGroup,
             make_scoped_refptr(new ClientSocketPoolHistograms("MockHttpProxy")),
             new MockHostResolver,
             tcp_socket_pool_,
+            NULL,
             NULL)),
         socks_socket_params_(new SOCKSSocketParams(
             proxy_tcp_socket_params_, true, HostPortPair("sockshost", 443),
             MEDIUM, GURL())),
         socks_socket_pool_(new MockSOCKSClientSocketPool(
             kMaxSockets,
             kMaxSocketsPerGroup,
             make_scoped_refptr(new ClientSocketPoolHistograms("MockSOCKS")),
             tcp_socket_pool_)) {
     scoped_refptr<SSLConfigService> ssl_config_service(
@@ skipping 515 matching lines @@
       handle.release_pending_http_proxy_connection());
   EXPECT_TRUE(tunnel_handle->socket());
   EXPECT_FALSE(tunnel_handle->socket()->IsConnected());
 }
 
 // It would be nice to also test the timeouts in SSLClientSocketPool.
 
 }  // namespace
 
 }  // namespace net