Revert "Make TCPClientSocketPool own the ConnectingSockets."

net/base/tcp_client_socket_pool.h

Index: net/base/tcp_client_socket_pool.h
diff --git a/net/base/tcp_client_socket_pool.h b/net/base/tcp_client_socket_pool.h
index 33d2a5b99561c3a3dc495af5679a55a3afb36b6b..ad75585e2c35a8d9a8366fe6bfddd03138abec64 100644
--- a/net/base/tcp_client_socket_pool.h
+++ b/net/base/tcp_client_socket_pool.h
@@ -154,6 +154,7 @@ class TCPClientSocketPool : public ClientSocketPool {
     scoped_refptr<TCPClientSocketPool> pool_;
     SingleRequestHostResolver resolver_;
     AddressList addresses_;
+    bool canceled_;
 
     // The time the Connect() method was called (if it got called).
     base::Time connect_start_time_;
@@ -161,9 +162,6 @@ class TCPClientSocketPool : public ClientSocketPool {
     DISALLOW_COPY_AND_ASSIGN(ConnectingSocket);
   };
 
-  typedef std::map<const ClientSocketHandle*, ConnectingSocket*>
-      ConnectingSocketMap;
-
   virtual ~TCPClientSocketPool();
 
   static void InsertRequestIntoQueue(const Request& r,
@@ -186,15 +184,11 @@ class TCPClientSocketPool : public ClientSocketPool {
     CleanupIdleSockets(false);
   }
 
-  // Removes the ConnectingSocket corresponding to |handle| from the
-  // |connecting_socket_map_|.
-  void RemoveConnectingSocket(const ClientSocketHandle* handle);
-
   ClientSocketFactory* const client_socket_factory_;
 
   GroupMap group_map_;
 
-  ConnectingSocketMap connecting_socket_map_;
+  std::map<const ClientSocketHandle*, ConnectingSocket*> connecting_socket_map_;
 
   // Timer used to periodically prune idle sockets that timed out or can't be
   // reused.