base::Bind: Convert proxy_resolving_client_socket.[cc,h] and deps.

net/socket/client_socket_pool_manager.cc

 // Copyright (c) 2011 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/socket/client_socket_pool_manager.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
@@ skipping 33 matching lines @@
                          HttpNetworkSession* session,
                          const ProxyInfo& proxy_info,
                          bool force_spdy_over_ssl,
                          bool want_spdy_over_npn,
                          const SSLConfig& ssl_config_for_origin,
                          const SSLConfig& ssl_config_for_proxy,
                          bool force_tunnel,
                          const BoundNetLog& net_log,
                          int num_preconnect_streams,
                          ClientSocketHandle* socket_handle,
-                         OldCompletionCallback* callback) {
+                         const CompletionCallback& callback) {
   scoped_refptr<TransportSocketParams> tcp_params;
   scoped_refptr<HttpProxySocketParams> http_proxy_params;
   scoped_refptr<SOCKSSocketParams> socks_params;
   scoped_ptr<HostPortPair> proxy_host_port;
 
   bool using_ssl = request_url.SchemeIs("https") || force_spdy_over_ssl;
 
   HostPortPair origin_host_port =
       HostPortPair(request_url.HostNoBrackets(),
                    request_url.EffectiveIntPort());
@@ skipping 210 matching lines @@
     int request_load_flags,
     RequestPriority request_priority,
     HttpNetworkSession* session,
     const ProxyInfo& proxy_info,
     bool force_spdy_over_ssl,
     bool want_spdy_over_npn,
     const SSLConfig& ssl_config_for_origin,
     const SSLConfig& ssl_config_for_proxy,
     const BoundNetLog& net_log,
     ClientSocketHandle* socket_handle,
-    OldCompletionCallback* callback) {
+    const CompletionCallback& callback) {
   DCHECK(socket_handle);
-  return InitSocketPoolHelper(request_url,
-                              request_extra_headers,
-                              request_load_flags,
-                              request_priority,
-                              session,
-                              proxy_info,
-                              force_spdy_over_ssl,
-                              want_spdy_over_npn,
-                              ssl_config_for_origin,
-                              ssl_config_for_proxy,
-                              false,
-                              net_log,
-                              0,
-                              socket_handle,
-                              callback);
+  return InitSocketPoolHelper(
+      request_url, request_extra_headers, request_load_flags, request_priority,
+      session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
+      ssl_config_for_origin, ssl_config_for_proxy, false, net_log, 0,
+      socket_handle, callback);
 }
 
 int InitSocketHandleForRawConnect(
     const HostPortPair& host_port_pair,
     HttpNetworkSession* session,
     const ProxyInfo& proxy_info,
     const SSLConfig& ssl_config_for_origin,
     const SSLConfig& ssl_config_for_proxy,
     const BoundNetLog& net_log,
     ClientSocketHandle* socket_handle,
-    OldCompletionCallback* callback) {
+    const CompletionCallback& callback) {
   DCHECK(socket_handle);
   // Synthesize an HttpRequestInfo.
   GURL request_url = GURL("http://" + host_port_pair.ToString());
   HttpRequestHeaders request_extra_headers;
   int request_load_flags = 0;
   RequestPriority request_priority = MEDIUM;
 
-  return InitSocketPoolHelper(request_url,
-                              request_extra_headers,
-                              request_load_flags,
-                              request_priority,
-                              session,
-                              proxy_info,
-                              false,
-                              false,
-                              ssl_config_for_origin,
-                              ssl_config_for_proxy,
-                              true,
-                              net_log,
-                              0,
-                              socket_handle,
-                              callback);
+  return InitSocketPoolHelper(
+      request_url, request_extra_headers, request_load_flags, request_priority,
+      session, proxy_info, false, false, ssl_config_for_origin,
+      ssl_config_for_proxy, true, net_log, 0, socket_handle, callback);
 }
 
 int PreconnectSocketsForHttpRequest(
     const GURL& request_url,
     const HttpRequestHeaders& request_extra_headers,
     int request_load_flags,
     RequestPriority request_priority,
     HttpNetworkSession* session,
     const ProxyInfo& proxy_info,
     bool force_spdy_over_ssl,
     bool want_spdy_over_npn,
     const SSLConfig& ssl_config_for_origin,
     const SSLConfig& ssl_config_for_proxy,
     const BoundNetLog& net_log,
     int num_preconnect_streams) {
-  return InitSocketPoolHelper(request_url,
-                              request_extra_headers,
-                              request_load_flags,
-                              request_priority,
-                              session,
-                              proxy_info,
-                              force_spdy_over_ssl,
-                              want_spdy_over_npn,
-                              ssl_config_for_origin,
-                              ssl_config_for_proxy,
-                              false,
-                              net_log,
-                              num_preconnect_streams,
-                              NULL,
-                              NULL);
+  return InitSocketPoolHelper(
+      request_url, request_extra_headers, request_load_flags, request_priority,
+      session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
+      ssl_config_for_origin, ssl_config_for_proxy, false, net_log,
+      num_preconnect_streams, NULL, CompletionCallback());
 }
 
 }  // namespace net