Move socket related files from net/base to net/socket.

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_BASE_TCP_CLIENT_SOCKET_POOL_H_
-#define NET_BASE_TCP_CLIENT_SOCKET_POOL_H_
+#ifndef NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_
+#define NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_
 
 #include <deque>
 #include <map>
 #include <string>
 
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
 #include "net/base/address_list.h"
-#include "net/base/client_socket_pool.h"
 #include "net/base/host_resolver.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 {
@@ skipping 125 matching lines @@
     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);
@@ skipping 149 matching lines @@
   // DoReleaseSocket() posts a task.  If ClientSocketPool gets deleted between
   // 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_BASE_TCP_CLIENT_SOCKET_POOL_H_
+#endif  // NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_