Refactor how ClientSocketPoolBaseHelper avoids re-entrancy.

net/socket/tcp_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/tcp_client_socket_pool.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 216 matching lines @@
                          casted_params->get()->destination().hostname().c_str(),
                          casted_params->get()->destination().port())));
   }
 
   return base_.RequestSocket(group_name, *casted_params, priority, handle,
                              callback, net_log);
 }
 
 void TCPClientSocketPool::CancelRequest(
     const std::string& group_name,
-    const ClientSocketHandle* handle) {
+    ClientSocketHandle* handle) {
   base_.CancelRequest(group_name, handle);
 }
 
 void TCPClientSocketPool::ReleaseSocket(
     const std::string& group_name,
     ClientSocket* socket,
     int id) {
   base_.ReleaseSocket(group_name, socket, id);
 }
 
 void TCPClientSocketPool::Flush() {
   base_.Flush();
 }
 
 void TCPClientSocketPool::CloseIdleSockets() {
   base_.CloseIdleSockets();
 }
 
 int TCPClientSocketPool::IdleSocketCountInGroup(
     const std::string& group_name) const {
   return base_.IdleSocketCountInGroup(group_name);
 }
 
 LoadState TCPClientSocketPool::GetLoadState(
     const std::string& group_name, const ClientSocketHandle* handle) const {
   return base_.GetLoadState(group_name, handle);
 }
 
 }  // namespace net