Refactor how ClientSocketPoolBaseHelper avoids re-entrancy.

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