Merge 54714 - Recommit 54405 - Fix late binding induced mismatch of Socket an...

net/socket/client_socket_handle.h

Index: net/socket/client_socket_handle.h
diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h
index 7fdf78469c58e7571f98584095f423b1a0af8d48..37676530d6eb40454c6c0b6c4b91f79a0bc97142 100644
--- a/net/socket/client_socket_handle.h
+++ b/net/socket/client_socket_handle.h
@@ -108,6 +108,9 @@ class ClientSocketHandle {
   void set_ssl_error_response_info(const HttpResponseInfo& ssl_error_state) {
     ssl_error_response_info_ = ssl_error_state;
   }
+  void set_pending_http_proxy_connection(ClientSocketHandle* connection) {
+    pending_http_proxy_connection_.reset(connection);
+  }
 
   // Only valid if there is no |socket_|.
   bool is_ssl_error() const {
@@ -120,6 +123,9 @@ class ClientSocketHandle {
   const HttpResponseInfo& ssl_error_response_info() const {
     return ssl_error_response_info_;
   }
+  ClientSocketHandle* release_pending_http_proxy_connection() {
+    return pending_http_proxy_connection_.release();
+  }
 
   // These may only be used if is_initialized() is true.
   const std::string& group_name() const { return group_name_; }
@@ -178,6 +184,7 @@ class ClientSocketHandle {
   int pool_id_;  // See ClientSocketPool::ReleaseSocket() for an explanation.
   bool is_ssl_error_;
   HttpResponseInfo ssl_error_response_info_;
+  scoped_ptr<ClientSocketHandle> pending_http_proxy_connection_;
   base::TimeTicks init_time_;
   base::TimeDelta setup_time_;