Refactor how ClientSocketPoolBaseHelper avoids re-entrancy.

net/socket/client_socket_handle.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_CLIENT_SOCKET_HANDLE_H_
 #define NET_SOCKET_CLIENT_SOCKET_HANDLE_H_
 
 #include <string>
 
 #include "base/logging.h"
@@ skipping 73 matching lines @@
   // NOTE: To prevent the socket from being kept alive, be sure to call its
   // Disconnect method.  This will result in the ClientSocketPool deleting the
   // ClientSocket.
   void Reset();
 
   // Used after Init() is called, but before the ClientSocketPool has
   // initialized the ClientSocketHandle.
   LoadState GetLoadState() const;
 
   // Returns true when Init() has completed successfully.
-  bool is_initialized() const { return socket_ != NULL; }
+  bool is_initialized() const { return is_initialized_; }
 
   // Returns the time tick when Init() was called.
   base::TimeTicks init_time() const { return init_time_; }
 
   // Returns the time between Init() and when is_initialized() becomes true.
   base::TimeDelta setup_time() const { return setup_time_; }
 
   // Used by ClientSocketPool to initialize the ClientSocketHandle.
   void set_is_reused(bool is_reused) { is_reused_ = is_reused; }
   void set_socket(ClientSocket* s) { socket_.reset(s); }
   void set_idle_time(base::TimeDelta idle_time) { idle_time_ = idle_time; }
   void set_pool_id(int id) { pool_id_ = id; }
   void set_tunnel_auth_response_info(
       const scoped_refptr<HttpResponseHeaders>& headers,
       const scoped_refptr<AuthChallengeInfo>& auth_challenge) {
     tunnel_auth_response_info_.headers = headers;
     tunnel_auth_response_info_.auth_challenge = auth_challenge;
   }
   void set_is_ssl_error(bool is_ssl_error) { is_ssl_error_ = is_ssl_error; }
 
   // These may only be used if is_initialized() is true.
   const std::string& group_name() const { return group_name_; }
+  int id() const { return pool_id_; }
   ClientSocket* socket() { return socket_.get(); }
   ClientSocket* release_socket() { return socket_.release(); }
   const HttpResponseInfo& tunnel_auth_response_info() const {
     return tunnel_auth_response_info_;
   }
   // Only valid if there is no |socket_|.
   bool is_ssl_error() const {
     DCHECK(socket_.get() == NULL);
     return is_ssl_error_;
   }
@@ skipping 31 matching lines @@
   void HandleInitCompletion(int result);
 
   // Resets the state of the ClientSocketHandle.  |cancel| indicates whether or
   // not to try to cancel the request with the ClientSocketPool.  Does not
   // reset the supplemental error state.
   void ResetInternal(bool cancel);
 
   // Resets the supplemental error state.
   void ResetErrorState();
 
+  bool is_initialized_;
   scoped_refptr<ClientSocketPool> pool_;
   scoped_ptr<ClientSocket> socket_;
   std::string group_name_;
   bool is_reused_;
   CompletionCallbackImpl<ClientSocketHandle> callback_;
   CompletionCallback* user_callback_;
   base::TimeDelta idle_time_;
   int pool_id_;  // See ClientSocketPool::ReleaseSocket() for an explanation.
   bool is_ssl_error_;
   HttpResponseInfo tunnel_auth_response_info_;
@@ skipping 31 matching lines @@
     user_callback_ = callback;
   } else {
     HandleInitCompletion(rv);
   }
   return rv;
 }
 
 }  // namespace net
 
 #endif  // NET_SOCKET_CLIENT_SOCKET_HANDLE_H_