Refactor how ClientSocketPoolBaseHelper avoids re-entrancy.

net/socket/socks_client_socket_pool.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/socket/socks_client_socket_pool.h"
 
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/socket/client_socket_factory.h"
@@ skipping 187 matching lines @@
                                          CompletionCallback* callback,
                                          const BoundNetLog& net_log) {
   const scoped_refptr<SOCKSSocketParams>* casted_socket_params =
       static_cast<const scoped_refptr<SOCKSSocketParams>*>(socket_params);
 
   return base_.RequestSocket(group_name, *casted_socket_params, priority,
                              handle, callback, net_log);
 }
 
 void SOCKSClientSocketPool::CancelRequest(const std::string& group_name,
-                                          const ClientSocketHandle* handle) {
+                                          ClientSocketHandle* handle) {
   base_.CancelRequest(group_name, handle);
 }
 
 void SOCKSClientSocketPool::ReleaseSocket(const std::string& group_name,
                                           ClientSocket* socket, int id) {
   base_.ReleaseSocket(group_name, socket, id);
 }
 
 void SOCKSClientSocketPool::Flush() {
   base_.Flush();
 }
 
 void SOCKSClientSocketPool::CloseIdleSockets() {
   base_.CloseIdleSockets();
 }
 
 int SOCKSClientSocketPool::IdleSocketCountInGroup(
     const std::string& group_name) const {
   return base_.IdleSocketCountInGroup(group_name);
 }
 
 LoadState SOCKSClientSocketPool::GetLoadState(
     const std::string& group_name, const ClientSocketHandle* handle) const {
   return base_.GetLoadState(group_name, handle);
 }
 
 }  // namespace net