Break out classes from tcp_client_socket_pool.h into their own files.

This is just shuffling code around to new files and adjusting header dependencies accordingly.
BUG=http://crbug.com/13289
TEST=none

Review URL: http://codereview.chromium.org/132060

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19123 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 227 deletions

diff --git a/net/socket/tcp_client_socket_pool.h b/net/socket/tcp_client_socket_pool.h
index 421ea9a..11982b6 100644
--- a/net/socket/tcp_client_socket_pool.h
+++ b/net/socket/tcp_client_socket_pool.h
@@ -5,50 +5,30 @@
 #ifndef NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_
 #define NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_
 
-#include <deque>
-#include <map>
 #include <string>
 
+#include "base/basictypes.h"
+#include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "base/timer.h"
-#include "net/base/address_list.h"
-#include "net/base/host_resolver.h"
+#include "net/socket/client_socket_pool_base.h"
 #include "net/socket/client_socket_pool.h"
 
 namespace net {
 
 class ClientSocketFactory;
-class ClientSocketPoolBase;
 
-// ConnectingSocket provides an abstract interface for "connecting" a socket.
-// The connection may involve host resolution, tcp connection, ssl connection,
-// etc.
-class ConnectingSocket {
- public:
-  ConnectingSocket() {}
-  virtual ~ConnectingSocket() {}
-
-  // Begins connecting the socket.  Returns OK on success, ERR_IO_PENDING if it
-  // cannot complete synchronously without blocking, or another net error code
-  // on error.
-  virtual int Connect() = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ConnectingSocket);
-};
-
-// TCPConnectingSocket handles the host resolution necessary for socket creation
+// TCPConnectJob handles the host resolution necessary for socket creation
 // and the tcp connect.
-class TCPConnectingSocket : public ConnectingSocket {
+class TCPConnectJob : public ConnectJob {
  public:
-  TCPConnectingSocket(const std::string& group_name,
-                      const HostResolver::RequestInfo& resolve_info,
-                      const ClientSocketHandle* handle,
-                      ClientSocketFactory* client_socket_factory,
-                      ClientSocketPoolBase* pool);
-  ~TCPConnectingSocket();
+  TCPConnectJob(const std::string& group_name,
+                const HostResolver::RequestInfo& resolve_info,
+                const ClientSocketHandle* handle,
+                ClientSocketFactory* client_socket_factory,
+                ClientSocketPoolBase* pool);
+  ~TCPConnectJob();
 
-  // ConnectingSocket methods.
+  // 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.
@@ -71,7 +51,7 @@ class TCPConnectingSocket : public ConnectingSocket {
   const HostResolver::RequestInfo resolve_info_;
   const ClientSocketHandle* const handle_;
   ClientSocketFactory* const client_socket_factory_;
-  CompletionCallbackImpl<TCPConnectingSocket> callback_;
+  CompletionCallbackImpl<TCPConnectJob> callback_;
   scoped_ptr<ClientSocket> socket_;
   ClientSocketPoolBase* const pool_;
   SingleRequestHostResolver resolver_;
@@ -80,193 +60,7 @@ class TCPConnectingSocket : public ConnectingSocket {
   // The time the Connect() method was called (if it got called).
   base::TimeTicks connect_start_time_;
 
-  DISALLOW_COPY_AND_ASSIGN(TCPConnectingSocket);
-};
-
-// A ClientSocketPoolBase is used to restrict the number of sockets open at
-// a time.  It also maintains a list of idle persistent sockets.
-//
-class ClientSocketPoolBase : public base::RefCounted<ClientSocketPoolBase> {
- public:
-  // A Request is allocated per call to RequestSocket that results in
-  // ERR_IO_PENDING.
-  struct Request {
-    // HostResolver::RequestInfo has no default constructor, so fudge something.
-    Request() : resolve_info(std::string(), 0) {}
-
-    Request(ClientSocketHandle* handle,
-            CompletionCallback* callback,
-            int priority,
-            const HostResolver::RequestInfo& resolve_info,
-            LoadState load_state)
-        : handle(handle), callback(callback), priority(priority),
-          resolve_info(resolve_info), load_state(load_state) {
-    }
-
-    ClientSocketHandle* handle;
-    CompletionCallback* callback;
-    int priority;
-    HostResolver::RequestInfo resolve_info;
-    LoadState load_state;
-  };
-
-  class ConnectingSocketFactory {
-   public:
-    ConnectingSocketFactory() {}
-    virtual ~ConnectingSocketFactory() {}
-
-    virtual ConnectingSocket* NewConnectingSocket(
-        const std::string& group_name,
-        const Request& request,
-        ClientSocketPoolBase* pool) const = 0;
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(ConnectingSocketFactory);
-  };
-
-  ClientSocketPoolBase(int max_sockets_per_group,
-                       HostResolver* host_resolver,
-                       ConnectingSocketFactory* connecting_socket_factory);
-
-  ~ClientSocketPoolBase();
-
-  int RequestSocket(const std::string& group_name,
-                    const HostResolver::RequestInfo& resolve_info,
-                    int priority,
-                    ClientSocketHandle* handle,
-                    CompletionCallback* callback);
-
-  void CancelRequest(const std::string& group_name,
-                     const ClientSocketHandle* handle);
-
-  void ReleaseSocket(const std::string& group_name,
-                     ClientSocket* socket);
-
-  void CloseIdleSockets();
-
-  HostResolver* GetHostResolver() const {
-    return host_resolver_;
-  }
-
-  int idle_socket_count() const {
-    return idle_socket_count_;
-  }
-
-  int IdleSocketCountInGroup(const std::string& group_name) const;
-
-  LoadState GetLoadState(const std::string& group_name,
-                         const ClientSocketHandle* handle) const;
-
-  // Used by ConnectingSocket until we remove the coupling between a specific
-  // ConnectingSocket and a ClientSocketHandle:
-
-  // Returns NULL if not found.  Otherwise it returns the Request*
-  // corresponding to the ConnectingSocket (keyed by |group_name| and |handle|.
-  // Note that this pointer may be invalidated after any call that might mutate
-  // the RequestMap or GroupMap, so the user should not hold onto the pointer
-  // for long.
-  Request* GetConnectingRequest(const std::string& group_name,
-                                const ClientSocketHandle* handle);
-
-  // Handles the completed Request corresponding to the ConnectingSocket (keyed
-  // by |group_name| and |handle|.  |deactivate| indicates whether or not to
-  // deactivate the socket, making the socket slot available for a new socket
-  // connection.  If |deactivate| is false, then set |socket| into |handle|.
-  // Returns the callback to run.
-  CompletionCallback* OnConnectingRequestComplete(
-      const std::string& group_name,
-      const ClientSocketHandle* handle,
-      bool deactivate,
-      ClientSocket* socket);
-
- private:
-  // Entry for a persistent socket which became idle at time |start_time|.
-  struct IdleSocket {
-    ClientSocket* socket;
-    base::TimeTicks start_time;
-
-    // An idle socket should be removed if it can't be reused, or has been idle
-    // for too long. |now| is the current time value (TimeTicks::Now()).
-    //
-    // An idle socket can't be reused if it is disconnected or has received
-    // data unexpectedly (hence no longer idle).  The unread data would be
-    // mistaken for the beginning of the next response if we were to reuse the
-    // socket for a new request.
-    bool ShouldCleanup(base::TimeTicks now) const;
-  };
-
-  typedef std::deque<Request> RequestQueue;
-  typedef std::map<const ClientSocketHandle*, Request> RequestMap;
-
-  // A Group is allocated per group_name when there are idle sockets or pending
-  // requests.  Otherwise, the Group object is removed from the map.
-  struct Group {
-    Group() : active_socket_count(0), sockets_handed_out_count(0) {}
-    std::deque<IdleSocket> idle_sockets;
-    RequestQueue pending_requests;
-    RequestMap connecting_requests;
-    int active_socket_count;  // number of active sockets
-    int sockets_handed_out_count;  // number of sockets given to clients
-  };
-
-  typedef std::map<std::string, Group> GroupMap;
-
-  typedef std::map<const ClientSocketHandle*, ConnectingSocket*>
-      ConnectingSocketMap;
-
-  static void InsertRequestIntoQueue(const Request& r,
-                                     RequestQueue* pending_requests);
-
-  // Closes all idle sockets if |force| is true.  Else, only closes idle
-  // sockets that timed out or can't be reused.
-  void CleanupIdleSockets(bool force);
-
-  // Called when the number of idle sockets changes.
-  void IncrementIdleCount();
-  void DecrementIdleCount();
-
-  // Called via PostTask by ReleaseSocket.
-  void DoReleaseSocket(const std::string& group_name, ClientSocket* socket);
-
-  // Called when timer_ fires.  This method scans the idle sockets removing
-  // sockets that timed out or can't be reused.
-  void OnCleanupTimerFired() {
-    CleanupIdleSockets(false);
-  }
-
-  // Removes the ConnectingSocket corresponding to |handle| from the
-  // |connecting_socket_map_|.
-  void RemoveConnectingSocket(const ClientSocketHandle* handle);
-
-  static void CheckSocketCounts(const Group& group);
-
-  // Remove an active socket.
-  void RemoveActiveSocket(const std::string& group_name, Group* group);
-
-  // Process a request from a group's pending_requests queue.
-  void ProcessPendingRequest(const std::string& group_name, Group* group);
-
-  GroupMap group_map_;
-
-  ConnectingSocketMap connecting_socket_map_;
-
-  // Timer used to periodically prune idle sockets that timed out or can't be
-  // reused.
-  base::RepeatingTimer<ClientSocketPoolBase> timer_;
-
-  // The total number of idle sockets in the system.
-  int idle_socket_count_;
-
-  // The maximum number of sockets kept per group.
-  const int max_sockets_per_group_;
-
-  // The host resolver that will be used to do DNS lookups for connecting
-  // sockets.
-  HostResolver* const host_resolver_;
-
-  scoped_ptr<ConnectingSocketFactory> connecting_socket_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolBase);
+  DISALLOW_COPY_AND_ASSIGN(TCPConnectJob);
 };
 
 class TCPClientSocketPool : public ClientSocketPool {
@@ -307,17 +101,17 @@ class TCPClientSocketPool : public ClientSocketPool {
  private:
   virtual ~TCPClientSocketPool();
 
-  class TCPConnectingSocketFactory
-      : public ClientSocketPoolBase::ConnectingSocketFactory {
+  class TCPConnectJobFactory
+      : public ClientSocketPoolBase::ConnectJobFactory {
    public:
-    TCPConnectingSocketFactory(ClientSocketFactory* client_socket_factory)
+    explicit TCPConnectJobFactory(ClientSocketFactory* client_socket_factory)
         : client_socket_factory_(client_socket_factory) {}
 
-    virtual ~TCPConnectingSocketFactory() {}
+    virtual ~TCPConnectJobFactory() {}
 
-    // ClientSocketPoolBase::ConnectingSocketFactory methods.
+    // ClientSocketPoolBase::ConnectJobFactory methods.
 
-    virtual ConnectingSocket* NewConnectingSocket(
+    virtual ConnectJob* NewConnectJob(
         const std::string& group_name,
         const ClientSocketPoolBase::Request& request,
         ClientSocketPoolBase* pool) const;
@@ -325,7 +119,7 @@ class TCPClientSocketPool : public ClientSocketPool {
    private:
     ClientSocketFactory* const client_socket_factory_;
 
-    DISALLOW_COPY_AND_ASSIGN(TCPConnectingSocketFactory);
+    DISALLOW_COPY_AND_ASSIGN(TCPConnectJobFactory);
   };
 
   // One might ask why ClientSocketPoolBase is also refcounted if its