Refactor how ClientSocketPoolBaseHelper avoids re-entrancy.

net/socket/socket_test_util.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/socket_test_util.h"
 
 #include <algorithm>
 #include <vector>
 
 
@@ skipping 774 matching lines @@
     return false;
   socket_.reset();
   handle_ = NULL;
   user_callback_ = NULL;
   return true;
 }
 
 void MockTCPClientSocketPool::MockConnectJob::OnConnect(int rv) {
   if (!socket_.get())
     return;
-  if (rv == OK)
+  if (rv == OK) {
     handle_->set_socket(socket_.release());
-  else
+  } else {
     socket_.reset();
+  }
 
   handle_ = NULL;
 
   if (user_callback_) {
     CompletionCallback* callback = user_callback_;
     user_callback_ = NULL;
     callback->Run(rv);
   }
 }
 
@@ skipping 17 matching lines @@
                                            const BoundNetLog& net_log) {
   ClientSocket* socket = client_socket_factory_->CreateTCPClientSocket(
       AddressList(), net_log.net_log());
   MockConnectJob* job = new MockConnectJob(socket, handle, callback);
   job_list_.push_back(job);
   handle->set_pool_id(1);
   return job->Connect();
 }
 
 void MockTCPClientSocketPool::CancelRequest(const std::string& group_name,
-                                            const ClientSocketHandle* handle) {
+                                            ClientSocketHandle* handle) {
   std::vector<MockConnectJob*>::iterator i;
   for (i = job_list_.begin(); i != job_list_.end(); ++i) {
     if ((*i)->CancelHandle(handle)) {
       cancel_count_++;
       break;
     }
   }
 }
 
 void MockTCPClientSocketPool::ReleaseSocket(const std::string& group_name,
@@ skipping 20 matching lines @@
                                              RequestPriority priority,
                                              ClientSocketHandle* handle,
                                              CompletionCallback* callback,
                                              const BoundNetLog& net_log) {
   return tcp_pool_->RequestSocket(group_name, socket_params, priority, handle,
                                   callback, net_log);
 }
 
 void MockSOCKSClientSocketPool::CancelRequest(
     const std::string& group_name,
-    const ClientSocketHandle* handle) {
+    ClientSocketHandle* handle) {
   return tcp_pool_->CancelRequest(group_name, handle);
 }
 
 void MockSOCKSClientSocketPool::ReleaseSocket(const std::string& group_name,
                                               ClientSocket* socket, int id) {
   return tcp_pool_->ReleaseSocket(group_name, socket, id);
 }
 
 MockSOCKSClientSocketPool::~MockSOCKSClientSocketPool() {}
 
@@ skipping 52 matching lines @@
 
 const char kSOCKS5OkRequest[] =
     { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
 
 const char kSOCKS5OkResponse[] =
     { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
 
 }  // namespace net