Refactor how ClientSocketPoolBaseHelper avoids re-entrancy.

net/socket/socks_client_socket_pool.h

 // 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.
 
 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 103 matching lines @@
 
   // ClientSocketPool methods:
   virtual int RequestSocket(const std::string& group_name,
                             const void* connect_params,
                             RequestPriority priority,
                             ClientSocketHandle* handle,
                             CompletionCallback* callback,
                             const BoundNetLog& net_log);
 
   virtual void CancelRequest(const std::string& group_name,
-                             const ClientSocketHandle* handle);
+                             ClientSocketHandle* handle);
 
   virtual void ReleaseSocket(const std::string& group_name,
                              ClientSocket* socket,
                              int id);
 
   virtual void Flush();
 
   virtual void CloseIdleSockets();
 
   virtual int IdleSocketCount() const {
@@ skipping 49 matching lines @@
   PoolBase base_;
 
   DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketPool);
 };
 
 REGISTER_SOCKET_PARAMS_FOR_POOL(SOCKSClientSocketPool, SOCKSSocketParams);
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_