Merge Chromium at r63472 : Initial merge by git.

Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a

1 files changed, 9 insertions, 4 deletions

diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h
index 383de63..96eb4cf 100644
--- a/net/socket/socks_client_socket_pool.h
+++ b/net/socket/socks_client_socket_pool.h
@@ -58,7 +58,7 @@ class SOCKSConnectJob : public ConnectJob {
                   const scoped_refptr<SOCKSSocketParams>& params,
                   const base::TimeDelta& timeout_duration,
                   TCPClientSocketPool* tcp_pool,
-                  const scoped_refptr<HostResolver> &host_resolver,
+                  HostResolver* host_resolver,
                   Delegate* delegate,
                   NetLog* net_log);
   virtual ~SOCKSConnectJob();
@@ -92,7 +92,7 @@ class SOCKSConnectJob : public ConnectJob {
 
   scoped_refptr<SOCKSSocketParams> socks_params_;
   TCPClientSocketPool* const tcp_pool_;
-  const scoped_refptr<HostResolver> resolver_;
+  HostResolver* const resolver_;
 
   State next_state_;
   CompletionCallbackImpl<SOCKSConnectJob> callback_;
@@ -108,7 +108,7 @@ class SOCKSClientSocketPool : public ClientSocketPool {
       int max_sockets,
       int max_sockets_per_group,
       ClientSocketPoolHistograms* histograms,
-      const scoped_refptr<HostResolver>& host_resolver,
+      HostResolver* host_resolver,
       TCPClientSocketPool* tcp_pool,
       NetLog* net_log);
 
@@ -122,6 +122,11 @@ class SOCKSClientSocketPool : public ClientSocketPool {
                             CompletionCallback* callback,
                             const BoundNetLog& net_log);
 
+  virtual void RequestSockets(const std::string& group_name,
+                              const void* params,
+                              int num_sockets,
+                              const BoundNetLog& net_log);
+
   virtual void CancelRequest(const std::string& group_name,
                              ClientSocketHandle* handle);
 
@@ -178,7 +183,7 @@ class SOCKSClientSocketPool : public ClientSocketPool {
 
    private:
     TCPClientSocketPool* const tcp_pool_;
-    const scoped_refptr<HostResolver> host_resolver_;
+    HostResolver* const host_resolver_;
     NetLog* net_log_;
 
     DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJobFactory);