Refactor ConnectJob and TCPConnectJob.

net/socket/tcp_client_socket_pool.h

 // Copyright (c) 2006-2008 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_TCP_CLIENT_SOCKET_POOL_H_
 #define NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 19 matching lines @@
   virtual ~TCPConnectJob();
 
   // ConnectJob methods.
 
   // Begins the host resolution and the TCP connect.  Returns OK on success
   // and ERR_IO_PENDING if it cannot immediately service the request.
   // Otherwise, it returns a net error code.
   virtual int Connect();
 
  private:
-  // Handles asynchronous completion of IO.  |result| represents the result of
-  // the IO operation.
+  enum State {
+    kStateResolveHost,
+    kStateResolveHostComplete,
+    kStateTCPConnect,
+    kStateTCPConnectComplete,
+    kStateNone,
+  };
+
   void OnIOComplete(int result);
 
-  // Handles both asynchronous and synchronous completion of IO.  |result|
-  // represents the result of the IO operation.  |synchronous| indicates
-  // whether or not the previous IO operation completed synchronously or
-  // asynchronously.  OnIOCompleteInternal returns the result of the next IO
-  // operation that executes, or just the value of |result|.
-  int OnIOCompleteInternal(int result, bool synchronous);
+  // Runs the state transition loop.
+  int DoLoop(int result);
 
-  const std::string group_name_;
+  int DoResolveHost();
+  int DoResolveHostComplete(int result);
+  int DoTCPConnect();
+  int DoTCPConnectComplete(int result);
+
   const HostResolver::RequestInfo resolve_info_;
-  const ClientSocketHandle* const handle_;
   ClientSocketFactory* const client_socket_factory_;
   CompletionCallbackImpl<TCPConnectJob> callback_;
-  scoped_ptr<ClientSocket> socket_;
-  Delegate* const delegate_;
   SingleRequestHostResolver resolver_;
   AddressList addresses_;
+  State next_state_;
 
   // The time the Connect() method was called (if it got called).
   base::TimeTicks connect_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(TCPConnectJob);
 };
 
 class TCPClientSocketPool : public ClientSocketPool {
  public:
   TCPClientSocketPool(int max_sockets_per_group,
@@ skipping 58 matching lines @@
   // the posting of the task and the execution, then we'll hit the DCHECK that
   // |ClientSocketPoolBase::group_map_| is empty.
   scoped_refptr<ClientSocketPoolBase> base_;
 
   DISALLOW_COPY_AND_ASSIGN(TCPClientSocketPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_