Refactor how ClientSocketPoolBaseHelper avoids re-entrancy.

net/socket/socket_test_util.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_SOCKET_TEST_UTIL_H_
 #define NET_SOCKET_SOCKET_TEST_UTIL_H_
 
 #include <cstring>
 #include <deque>
 #include <string>
@@ skipping 617 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(MockConnectJob);
   };
 
   MockTCPClientSocketPool(
       int max_sockets,
       int max_sockets_per_group,
       const scoped_refptr<ClientSocketPoolHistograms>& histograms,
       ClientSocketFactory* socket_factory);
 
-  int release_count() { return release_count_; };
-  int cancel_count() { return cancel_count_; };
+  int release_count() const { return release_count_; };
+  int cancel_count() const { return cancel_count_; };
 
   // TCPClientSocketPool methods.
   virtual int RequestSocket(const std::string& group_name,
                             const void* socket_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);
 
  protected:
   virtual ~MockTCPClientSocketPool();
 
  private:
   ClientSocketFactory* client_socket_factory_;
   int release_count_;
   int cancel_count_;
@@ skipping 12 matching lines @@
 
   // SOCKSClientSocketPool methods.
   virtual int RequestSocket(const std::string& group_name,
                             const void* socket_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);
 
  protected:
   virtual ~MockSOCKSClientSocketPool();
 
  private:
   const scoped_refptr<TCPClientSocketPool> tcp_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(MockSOCKSClientSocketPool);
@@ skipping 47 matching lines @@
 
 extern const char kSOCKS5OkRequest[];
 extern const int kSOCKS5OkRequestLength;
 
 extern const char kSOCKS5OkResponse[];
 extern const int kSOCKS5OkResponseLength;
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SOCKET_TEST_UTIL_H_