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

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

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

45 files changed, 150 insertions, 147 deletions

diff --git a/net/ftp/ftp_network_layer.cc b/net/ftp/ftp_network_layer.cc
index fa0e87c..df53a09 100644
--- a/net/ftp/ftp_network_layer.cc
+++ b/net/ftp/ftp_network_layer.cc
@@ -4,9 +4,9 @@
 
 #include "net/ftp/ftp_network_layer.h"
 
-#include "net/base/client_socket_factory.h"
 #include "net/ftp/ftp_network_session.h"
 #include "net/ftp/ftp_network_transaction.h"
+#include "net/socket/client_socket_factory.h"
 
 namespace net {
 
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 6c71582..87c3e16 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -6,12 +6,12 @@
 
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
-#include "net/base/client_socket.h"
-#include "net/base/client_socket_factory.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/net_errors.h"
 #include "net/ftp/ftp_network_session.h"
 #include "net/ftp/ftp_request_info.h"
+#include "net/socket/client_socket.h"
+#include "net/socket/client_socket_factory.h"
 
 // TODO(ibrar): Try to avoid sscanf.
 #if !defined(COMPILER_MSVC)
diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc
index 2044b1d..b45156b 100644
--- a/net/ftp/ftp_network_transaction_unittest.cc
+++ b/net/ftp/ftp_network_transaction_unittest.cc
@@ -8,10 +8,10 @@
 #include "net/base/host_resolver.h"
 #include "net/base/host_resolver_unittest.h"
 #include "net/base/io_buffer.h"
-#include "net/base/socket_test_util.h"
 #include "net/base/test_completion_callback.h"
 #include "net/ftp/ftp_network_session.h"
 #include "net/ftp/ftp_request_info.h"
+#include "net/socket/socket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/net/http/http_basic_stream.h b/net/http/http_basic_stream.h
index 32f1b8a..2a82b7a 100644
--- a/net/http/http_basic_stream.h
+++ b/net/http/http_basic_stream.h
@@ -10,8 +10,8 @@
 #define NET_HTTP_HTTP_BASIC_STREAM_H_
 
 #include "base/basictypes.h"
-#include "net/base/client_socket_handle.h"
 #include "net/http/http_stream.h"
+#include "net/socket/client_socket_handle.h"
 
 namespace net {
 
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index ddaefb1..6c3829e 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -5,9 +5,9 @@
 #include "net/http/http_network_layer.h"
 
 #include "base/logging.h"
-#include "net/base/client_socket_factory.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_network_transaction.h"
+#include "net/socket/client_socket_factory.h"
 
 namespace net {
 
diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc
index a85821e..32888f0 100644
--- a/net/http/http_network_layer_unittest.cc
+++ b/net/http/http_network_layer_unittest.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "net/base/host_resolver.h"
-#include "net/base/socket_test_util.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_transaction_unittest.h"
 #include "net/proxy/proxy_service.h"
+#include "net/socket/socket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index d8345ca..b17b99d 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -5,11 +5,12 @@
 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
 
+#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "net/base/ssl_client_auth_cache.h"
 #include "net/base/ssl_config_service.h"
-#include "net/base/tcp_client_socket_pool.h"
 #include "net/http/http_auth_cache.h"
+#include "net/socket/tcp_client_socket_pool.h"
 
 namespace net {
 
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 5a52f2a..06bba2b 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -10,14 +10,12 @@
 #include "base/string_util.h"
 #include "base/trace_event.h"
 #include "build/build_config.h"
-#include "net/base/client_socket_factory.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/ssl_cert_request_info.h"
-#include "net/base/ssl_client_socket.h"
 #include "net/base/upload_data_stream.h"
 #include "net/http/http_auth.h"
 #include "net/http/http_auth_handler.h"
@@ -27,6 +25,8 @@
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
+#include "net/socket/client_socket_factory.h"
+#include "net/socket/ssl_client_socket.h"
 
 using base::Time;
 
diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
index 6358e6a..45bef58 100644
--- a/net/http/http_network_transaction.h
+++ b/net/http/http_network_transaction.h
@@ -11,8 +11,6 @@
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "net/base/address_list.h"
-#include "net/base/client_socket_handle.h"
-#include "net/base/client_socket_pool.h"
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
@@ -23,6 +21,8 @@
 #include "net/http/http_response_info.h"
 #include "net/http/http_transaction.h"
 #include "net/proxy/proxy_service.h"
+#include "net/socket/client_socket_handle.h"
+#include "net/socket/client_socket_pool.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace net {
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index bbb022b..df889cd 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -5,11 +5,8 @@
 #include <math.h>  // ceil
 
 #include "base/compiler_specific.h"
-#include "net/base/client_socket_factory.h"
 #include "net/base/completion_callback.h"
 #include "net/base/host_resolver_unittest.h"
-#include "net/base/socket_test_util.h"
-#include "net/base/ssl_client_socket.h"
 #include "net/base/ssl_info.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/upload_data.h"
@@ -18,6 +15,9 @@
 #include "net/http/http_network_transaction.h"
 #include "net/http/http_transaction_unittest.h"
 #include "net/proxy/proxy_config_service_fixed.h"
+#include "net/socket/client_socket_factory.h"
+#include "net/socket/socket_test_util.h"
+#include "net/socket/ssl_client_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/net/net.gyp b/net/net.gyp
index 42f9a28..4b5f76c 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -43,13 +43,6 @@
         'base/cert_verifier.cc',
         'base/cert_verifier.h',
         'base/cert_verify_result.h',
-        'base/client_socket.cc',
-        'base/client_socket.h',
-        'base/client_socket_factory.cc',
-        'base/client_socket_factory.h',
-        'base/client_socket_handle.cc',
-        'base/client_socket_handle.h',
-        'base/client_socket_pool.h',
         'base/completion_callback.h',
         'base/connection_type_histograms.cc',
         'base/connection_type_histograms.h',
@@ -114,26 +107,12 @@
         'base/sdch_filter.h',
         'base/sdch_manager.cc',
         'base/sdch_manager.h',
-        'base/socket.h',
         'base/ssl_cert_request_info.h',
         'base/ssl_client_auth_cache.cc',
         'base/ssl_client_auth_cache.h',
-        'base/ssl_client_socket.h',
-        'base/ssl_client_socket_mac.cc',
-        'base/ssl_client_socket_nss.cc',
-        'base/ssl_client_socket_win.cc',
-        'base/ssl_client_socket_win.h',
         'base/ssl_config_service.cc',
         'base/ssl_config_service.h',
         'base/ssl_info.h',
-        'base/ssl_test_util.cc',
-        'base/tcp_client_socket.h',
-        'base/tcp_client_socket_libevent.cc',
-        'base/tcp_client_socket_libevent.h',
-        'base/tcp_client_socket_pool.cc',
-        'base/tcp_client_socket_pool.h',
-        'base/tcp_client_socket_win.cc',
-        'base/tcp_client_socket_win.h',
         'base/telnet_server.cc',
         'base/telnet_server.h',
         'base/upload_data.cc',
@@ -280,6 +259,28 @@
         'proxy/proxy_server.h',
         'proxy/proxy_service.cc',
         'proxy/proxy_service.h',
+        'socket/client_socket.cc',
+        'socket/client_socket.h',
+        'socket/client_socket_factory.cc',
+        'socket/client_socket_factory.h',
+        'socket/client_socket_handle.cc',
+        'socket/client_socket_handle.h',
+        'socket/client_socket_pool.h',
+        'socket/socket.h',
+        'socket/ssl_client_socket.h',
+        'socket/ssl_client_socket_mac.cc',
+        'socket/ssl_client_socket_nss.cc',
+        'socket/ssl_client_socket_win.cc',
+        'socket/ssl_client_socket_win.h',
+        'socket/ssl_test_util.cc',
+        'socket/ssl_test_util.h',
+        'socket/tcp_client_socket.h',
+        'socket/tcp_client_socket_libevent.cc',
+        'socket/tcp_client_socket_libevent.h',
+        'socket/tcp_client_socket_pool.cc',
+        'socket/tcp_client_socket_pool.h',
+        'socket/tcp_client_socket_win.cc',
+        'socket/tcp_client_socket_win.h',
         'url_request/url_request.cc',
         'url_request/url_request.h',
         'url_request/url_request_about_job.cc',
@@ -340,7 +341,7 @@
         [ 'OS == "win"', {
             'sources/': [ ['exclude', '_(mac|linux|posix)\\.cc$'] ],
             'sources!': [
-              'base/tcp_client_socket_libevent.cc',
+              'socket/tcp_client_socket_libevent.cc',
             ],
             'dependencies': [
               'tld_cleanup',
@@ -369,8 +370,8 @@
           {  # else: OS != "linux"
             'sources!': [
               'base/nss_memio.c',
-              'base/ssl_client_socket_nss.cc',
               'base/x509_certificate_nss.cc',
+              'socket/ssl_client_socket_nss.cc',
             ],
             # Get U_STATIC_IMPLEMENTATION and -I directories on Linux.
             'dependencies': [
@@ -426,11 +427,7 @@
         'base/run_all_unittests.cc',
         'base/sdch_filter_unittest.cc',
         'base/ssl_client_auth_cache_unittest.cc',
-        'base/ssl_client_socket_unittest.cc',
         'base/ssl_config_service_unittest.cc',
-        'base/tcp_client_socket_pool_unittest.cc',
-        'base/tcp_client_socket_unittest.cc',
-        'base/tcp_pinger_unittest.cc',
         'base/telnet_server_unittest.cc',
         'base/test_completion_callback_unittest.cc',
         'base/wininet_util_unittest.cc',
@@ -469,6 +466,10 @@
         'proxy/proxy_script_fetcher_unittest.cc',
         'proxy/proxy_server_unittest.cc',
         'proxy/proxy_service_unittest.cc',
+        'socket/ssl_client_socket_unittest.cc',
+        'socket/tcp_client_socket_pool_unittest.cc',
+        'socket/tcp_client_socket_unittest.cc',
+        'socket/tcp_pinger_unittest.cc',
         'url_request/url_request_unittest.cc',
         'url_request/url_request_unittest.h',
       ],
@@ -584,12 +585,12 @@
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
-        'base/socket_test_util.cc',
-        'base/socket_test_util.h',
         'disk_cache/disk_cache_test_util.cc',
         'disk_cache/disk_cache_test_util.h',
         'proxy/proxy_config_service_common_unittest.cc',
         'proxy/proxy_config_service_common_unittest.h',
+        'socket/socket_test_util.cc',
+        'socket/socket_test_util.h',
       ],
     },
     {
diff --git a/net/base/client_socket.cc b/net/socket/client_socket.cc
index 4c607fa..3cefab4 100644
--- a/net/base/client_socket.cc
+++ b/net/socket/client_socket.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/client_socket.h"
+#include "net/socket/client_socket.h"
 
 #include "base/logging.h"
 #include "net/base/net_errors.h"
diff --git a/net/base/client_socket.h b/net/socket/client_socket.h
index 3553d52..54866b8 100644
--- a/net/base/client_socket.h
+++ b/net/socket/client_socket.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_CLIENT_SOCKET_H_
-#define NET_BASE_CLIENT_SOCKET_H_
+#ifndef NET_SOCKET_CLIENT_SOCKET_H_
+#define NET_SOCKET_CLIENT_SOCKET_H_
 
 #include "build/build_config.h"
 
@@ -11,7 +11,7 @@
 #include <sys/socket.h>
 #endif
 
-#include "net/base/socket.h"
+#include "net/socket/socket.h"
 
 namespace net {
 
@@ -56,4 +56,4 @@ class ClientSocket : public Socket {
 
 }  // namespace net
 
-#endif  // NET_BASE_CLIENT_SOCKET_H_
+#endif  // NET_SOCKET_CLIENT_SOCKET_H_
diff --git a/net/base/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index 70e1fd6..fe2ce10 100644
--- a/net/base/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/client_socket_factory.h"
+#include "net/socket/client_socket_factory.h"
 
 #include "base/singleton.h"
 #include "build/build_config.h"
 #if defined(OS_WIN)
-#include "net/base/ssl_client_socket_win.h"
+#include "net/socket/ssl_client_socket_win.h"
 #elif defined(OS_LINUX)
-#include "net/base/ssl_client_socket_nss.h"
+#include "net/socket/ssl_client_socket_nss.h"
 #elif defined(OS_MACOSX)
-#include "net/base/ssl_client_socket_mac.h"
+#include "net/socket/ssl_client_socket_mac.h"
 #endif
-#include "net/base/tcp_client_socket.h"
+#include "net/socket/tcp_client_socket.h"
 
 namespace net {
 
diff --git a/net/base/client_socket_factory.h b/net/socket/client_socket_factory.h
index e421473..6f4ff17 100644
--- a/net/base/client_socket_factory.h
+++ b/net/socket/client_socket_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_CLIENT_SOCKET_FACTORY_H_
-#define NET_BASE_CLIENT_SOCKET_FACTORY_H_
+#ifndef NET_SOCKET_CLIENT_SOCKET_FACTORY_H_
+#define NET_SOCKET_CLIENT_SOCKET_FACTORY_H_
 
 #include <string>
 
@@ -34,4 +34,4 @@ class ClientSocketFactory {
 
 }  // namespace net
 
-#endif  // NET_BASE_CLIENT_SOCKET_FACTORY_H_
+#endif  // NET_SOCKET_CLIENT_SOCKET_FACTORY_H_
diff --git a/net/base/client_socket_handle.cc b/net/socket/client_socket_handle.cc
index adedcd4..96dec03 100644
--- a/net/base/client_socket_handle.cc
+++ b/net/socket/client_socket_handle.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/client_socket_handle.h"
+#include "net/socket/client_socket_handle.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "net/base/client_socket.h"
-#include "net/base/client_socket_pool.h"
 #include "net/base/net_errors.h"
+#include "net/socket/client_socket.h"
+#include "net/socket/client_socket_pool.h"
 
 namespace net {
 
diff --git a/net/base/client_socket_handle.h b/net/socket/client_socket_handle.h
index 777c752..0f80fa0 100644
--- a/net/base/client_socket_handle.h
+++ b/net/socket/client_socket_handle.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_CLIENT_SOCKET_HANDLE_H_
-#define NET_BASE_CLIENT_SOCKET_HANDLE_H_
+#ifndef NET_SOCKET_CLIENT_SOCKET_HANDLE_H_
+#define NET_SOCKET_CLIENT_SOCKET_HANDLE_H_
 
 #include <string>
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "net/base/client_socket.h"
 #include "net/base/completion_callback.h"
 #include "net/base/host_resolver.h"
 #include "net/base/load_states.h"
+#include "net/socket/client_socket.h"
 
 namespace net {
 
@@ -97,4 +97,4 @@ class ClientSocketHandle {
 
 }  // namespace net
 
-#endif  // NET_BASE_CLIENT_SOCKET_HANDLE_H_
+#endif  // NET_SOCKET_CLIENT_SOCKET_HANDLE_H_
diff --git a/net/base/client_socket_pool.h b/net/socket/client_socket_pool.h
index 4567108..b3a7bba 100644
--- a/net/base/client_socket_pool.h
+++ b/net/socket/client_socket_pool.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_CLIENT_SOCKET_POOL_H_
-#define NET_BASE_CLIENT_SOCKET_POOL_H_
+#ifndef NET_SOCKET_CLIENT_SOCKET_POOL_H_
+#define NET_SOCKET_CLIENT_SOCKET_POOL_H_
 
 #include <deque>
 #include <map>
@@ -94,4 +94,4 @@ class ClientSocketPool : public base::RefCounted<ClientSocketPool> {
 
 }  // namespace net
 
-#endif  // NET_BASE_CLIENT_SOCKET_POOL_H_
+#endif  // NET_SOCKET_CLIENT_SOCKET_POOL_H_
diff --git a/net/base/socket.h b/net/socket/socket.h
index b03b6c2..8e451d2 100644
--- a/net/base/socket.h
+++ b/net/socket/socket.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_SOCKET_H_
-#define NET_BASE_SOCKET_H_
+#ifndef NET_SOCKET_SOCKET_H_
+#define NET_SOCKET_SOCKET_H_
 
 #include "net/base/completion_callback.h"
 
@@ -41,4 +41,4 @@ class Socket {
 
 }  // namespace net
 
-#endif  // NET_BASE_SOCKET_H_
+#endif  // NET_SOCKET_SOCKET_H_
diff --git a/net/base/socket_test_util.cc b/net/socket/socket_test_util.cc
index 414cc2a..be98865 100644
--- a/net/base/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/socket_test_util.h"
+#include "net/socket/socket_test_util.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "net/base/io_buffer.h"
-#include "net/base/socket.h"
-#include "net/base/ssl_client_socket.h"
 #include "net/base/ssl_info.h"
+#include "net/socket/socket.h"
+#include "net/socket/ssl_client_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/net/base/socket_test_util.h b/net/socket/socket_test_util.h
index 952e97a..4d3b569 100644
--- a/net/base/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_SOCKET_TEST_UTIL_H_
-#define NET_BASE_SOCKET_TEST_UTIL_H_
+#ifndef NET_SOCKET_SOCKET_TEST_UTIL_H_
+#define NET_SOCKET_SOCKET_TEST_UTIL_H_
 
 #include <string>
 #include <vector>
@@ -11,9 +11,9 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "net/base/address_list.h"
-#include "net/base/client_socket_factory.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
+#include "net/socket/client_socket_factory.h"
 
 namespace net {
 
@@ -201,4 +201,4 @@ class MockClientSocketFactory : public ClientSocketFactory {
 
 }  // namespace net
 
-#endif  // NET_BASE_SOCKET_TEST_UTIL_H_
+#endif  // NET_SOCKET_SOCKET_TEST_UTIL_H_
diff --git a/net/base/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index 8b9cca6..8bd4c088 100644
--- a/net/base/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_SSL_CLIENT_SOCKET_H_
-#define NET_BASE_SSL_CLIENT_SOCKET_H_
+#ifndef NET_SOCKET_SSL_CLIENT_SOCKET_H_
+#define NET_SOCKET_SSL_CLIENT_SOCKET_H_
 
-#include "net/base/client_socket.h"
+#include "net/socket/client_socket.h"
 
 namespace net {
 
@@ -31,4 +31,4 @@ class SSLClientSocket : public ClientSocket {
 
 }  // namespace net
 
-#endif  // NET_BASE_SSL_CLIENT_SOCKET_H_
+#endif  // NET_SOCKET_SSL_CLIENT_SOCKET_H_
diff --git a/net/base/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc
index 7528b13..bd1f60d 100644
--- a/net/base/ssl_client_socket_mac.cc
+++ b/net/socket/ssl_client_socket_mac.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/ssl_client_socket_mac.h"
+#include "net/socket/ssl_client_socket_mac.h"
 
 #include "base/singleton.h"
 #include "base/string_util.h"
diff --git a/net/base/ssl_client_socket_mac.h b/net/socket/ssl_client_socket_mac.h
index 6e088bb..f9a08af 100644
--- a/net/base/ssl_client_socket_mac.h
+++ b/net/socket/ssl_client_socket_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_SSL_CLIENT_SOCKET_MAC_H_
-#define NET_BASE_SSL_CLIENT_SOCKET_MAC_H_
+#ifndef NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_
+#define NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_
 
 #include <Security/Security.h>
 
@@ -12,8 +12,8 @@
 
 #include "base/scoped_ptr.h"
 #include "net/base/completion_callback.h"
-#include "net/base/ssl_client_socket.h"
 #include "net/base/ssl_config_service.h"
+#include "net/socket/ssl_client_socket.h"
 
 namespace net {
 
@@ -105,4 +105,4 @@ class SSLClientSocketMac : public SSLClientSocket {
 
 }  // namespace net
 
-#endif  // NET_BASE_SSL_CLIENT_SOCKET_MAC_H_
+#endif  // NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_
diff --git a/net/base/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index c48f0b0..786f897 100644
--- a/net/base/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -48,7 +48,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "net/base/ssl_client_socket_nss.h"
+#include "net/socket/ssl_client_socket_nss.h"
 
 #include <certdb.h>
 #include <nspr.h>
diff --git a/net/base/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
index 643051f..f53e53a 100644
--- a/net/base/ssl_client_socket_nss.h
+++ b/net/socket/ssl_client_socket_nss.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_SSL_CLIENT_SOCKET_NSS_H_
-#define NET_BASE_SSL_CLIENT_SOCKET_NSS_H_
+#ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
+#define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
 
 // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424
 // until NSS 3.12.2 comes out and we update to it.
@@ -19,8 +19,8 @@
 #include "net/base/cert_verify_result.h"
 #include "net/base/completion_callback.h"
 #include "net/base/nss_memio.h"
-#include "net/base/ssl_client_socket.h"
 #include "net/base/ssl_config_service.h"
+#include "net/socket/ssl_client_socket.h"
 
 namespace net {
 
@@ -124,4 +124,4 @@ class SSLClientSocketNSS : public SSLClientSocket {
 
 }  // namespace net
 
-#endif  // NET_BASE_SSL_CLIENT_SOCKET_NSS_H_
+#endif  // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
diff --git a/net/base/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 2d764e9..c6308fa 100644
--- a/net/base/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "net/socket/ssl_client_socket.h"
+
 #include "net/base/address_list.h"
-#include "net/base/client_socket_factory.h"
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
-#include "net/base/ssl_client_socket.h"
 #include "net/base/ssl_config_service.h"
-#include "net/base/ssl_test_util.h"
-#include "net/base/tcp_client_socket.h"
 #include "net/base/test_completion_callback.h"
+#include "net/socket/client_socket_factory.h"
+#include "net/socket/ssl_test_util.h"
+#include "net/socket/tcp_client_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/net/base/ssl_client_socket_win.cc b/net/socket/ssl_client_socket_win.cc
index 9cfdfb2..bd2c594 100644
--- a/net/base/ssl_client_socket_win.cc
+++ b/net/socket/ssl_client_socket_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/ssl_client_socket_win.h"
+#include "net/socket/ssl_client_socket_win.h"
 
 #include <schnlsp.h>
 
diff --git a/net/base/ssl_client_socket_win.h b/net/socket/ssl_client_socket_win.h
index 12bf18f..6e03309 100644
--- a/net/base/ssl_client_socket_win.h
+++ b/net/socket/ssl_client_socket_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_SSL_CLIENT_SOCKET_WIN_H_
-#define NET_BASE_SSL_CLIENT_SOCKET_WIN_H_
+#ifndef NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_
+#define NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_
 
 #define SECURITY_WIN32  // Needs to be defined before including security.h
 
@@ -17,8 +17,8 @@
 #include "net/base/cert_verifier.h"
 #include "net/base/cert_verify_result.h"
 #include "net/base/completion_callback.h"
-#include "net/base/ssl_client_socket.h"
 #include "net/base/ssl_config_service.h"
+#include "net/socket/ssl_client_socket.h"
 
 namespace net {
 
@@ -154,4 +154,4 @@ class SSLClientSocketWin : public SSLClientSocket {
 
 }  // namespace net
 
-#endif  // NET_BASE_SSL_CLIENT_SOCKET_WIN_H_
+#endif  // NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_
diff --git a/net/base/ssl_test_util.cc b/net/socket/ssl_test_util.cc
index f470139..f615662 100644
--- a/net/base/ssl_test_util.cc
+++ b/net/socket/ssl_test_util.cc
@@ -5,7 +5,7 @@
 #include <string>
 #include <algorithm>
 
-#include "net/base/ssl_test_util.h"
+#include "net/socket/ssl_test_util.h"
 
 #include "build/build_config.h"
 
@@ -30,10 +30,10 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
-#include "net/base/tcp_pinger.h"
 #include "net/base/host_resolver.h"
-#include "net/base/tcp_client_socket.h"
 #include "net/base/test_completion_callback.h"
+#include "net/socket/tcp_client_socket.h"
+#include "net/socket/tcp_pinger.h"
 #include "testing/platform_test.h"
 
 #if defined(OS_WIN)
diff --git a/net/base/ssl_test_util.h b/net/socket/ssl_test_util.h
index 54449ee..acda685 100644
--- a/net/base/ssl_test_util.h
+++ b/net/socket/ssl_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_SSL_TEST_UTIL_H_
-#define NET_BASE_SSL_TEST_UTIL_H_
+#ifndef NET_SOCKET_SSL_TEST_UTIL_H_
+#define NET_SOCKET_SSL_TEST_UTIL_H_
 
 #include "build/build_config.h"
 
@@ -112,4 +112,4 @@ class TestServerLauncher {
 
 }
 
-#endif  // NET_BASE_SSL_TEST_UTIL_H_
+#endif  // NET_SOCKET_SSL_TEST_UTIL_H_
diff --git a/net/base/tcp_client_socket.h b/net/socket/tcp_client_socket.h
index 820e586..194de6e 100644
--- a/net/base/tcp_client_socket.h
+++ b/net/socket/tcp_client_socket.h
@@ -2,15 +2,15 @@
 // 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_H_
-#define NET_BASE_TCP_CLIENT_SOCKET_H_
+#ifndef NET_SOCKET_TCP_CLIENT_SOCKET_H_
+#define NET_SOCKET_TCP_CLIENT_SOCKET_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include "net/base/tcp_client_socket_win.h"
+#include "net/socket/tcp_client_socket_win.h"
 #elif defined(OS_POSIX)
-#include "net/base/tcp_client_socket_libevent.h"
+#include "net/socket/tcp_client_socket_libevent.h"
 #endif
 
 namespace net {
@@ -24,4 +24,4 @@ typedef TCPClientSocketLibevent TCPClientSocket;
 
 }  // namespace net
 
-#endif  // NET_BASE_TCP_CLIENT_SOCKET_H_
+#endif  // NET_SOCKET_TCP_CLIENT_SOCKET_H_
diff --git a/net/base/tcp_client_socket_libevent.cc b/net/socket/tcp_client_socket_libevent.cc
index 7d42e4a..a8e4387 100644
--- a/net/base/tcp_client_socket_libevent.cc
+++ b/net/socket/tcp_client_socket_libevent.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/tcp_client_socket_libevent.h"
+#include "net/socket/tcp_client_socket_libevent.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/net/base/tcp_client_socket_libevent.h b/net/socket/tcp_client_socket_libevent.h
index 041ca7c..601d497 100644
--- a/net/base/tcp_client_socket_libevent.h
+++ b/net/socket/tcp_client_socket_libevent.h
@@ -2,8 +2,8 @@
 // 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_LIBEVENT_H_
-#define NET_BASE_TCP_CLIENT_SOCKET_LIBEVENT_H_
+#ifndef NET_SOCKET_TCP_CLIENT_SOCKET_LIBEVENT_H_
+#define NET_SOCKET_TCP_CLIENT_SOCKET_LIBEVENT_H_
 
 #include <sys/socket.h>  // for struct sockaddr
 
@@ -11,8 +11,8 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "net/base/address_list.h"
-#include "net/base/client_socket.h"
 #include "net/base/completion_callback.h"
+#include "net/socket/client_socket.h"
 
 struct event;  // From libevent
 
@@ -132,4 +132,4 @@ class TCPClientSocketLibevent : public ClientSocket {
 
 }  // namespace net
 
-#endif  // NET_BASE_TCP_CLIENT_SOCKET_LIBEVENT_H_
+#endif  // NET_SOCKET_TCP_CLIENT_SOCKET_LIBEVENT_H_
diff --git a/net/base/tcp_client_socket_pool.cc b/net/socket/tcp_client_socket_pool.cc
index 94b53ca..534d10a 100644
--- a/net/base/tcp_client_socket_pool.cc
+++ b/net/socket/tcp_client_socket_pool.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/tcp_client_socket_pool.h"
+#include "net/socket/tcp_client_socket_pool.h"
 
 #include "base/compiler_specific.h"
 #include "base/field_trial.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/stl_util-inl.h"
-#include "net/base/client_socket_factory.h"
-#include "net/base/client_socket_handle.h"
 #include "net/base/net_errors.h"
-#include "net/base/tcp_client_socket.h"
+#include "net/socket/client_socket_factory.h"
+#include "net/socket/client_socket_handle.h"
+#include "net/socket/tcp_client_socket.h"
 
 using base::TimeDelta;
 
@@ -489,7 +489,7 @@ void ClientSocketPoolBase::ProcessPendingRequest(const std::string& group_name,
 
   int rv = RequestSocket(
       group_name, r.resolve_info, r.priority, r.handle, r.callback);
-  
+
   // |group| may be invalid after RequestSocket.
 
   if (rv != ERR_IO_PENDING)
diff --git a/net/base/tcp_client_socket_pool.h b/net/socket/tcp_client_socket_pool.h
index 5e83e7e..e237be5 100644
--- a/net/base/tcp_client_socket_pool.h
+++ b/net/socket/tcp_client_socket_pool.h
@@ -2,8 +2,8 @@
 // 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>
@@ -12,8 +12,8 @@
 #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 {
 
@@ -159,7 +159,7 @@ class ClientSocketPoolBase : public base::RefCounted<ClientSocketPoolBase> {
 
   // 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
@@ -167,7 +167,7 @@ class ClientSocketPoolBase : public base::RefCounted<ClientSocketPoolBase> {
   // 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
@@ -337,4 +337,4 @@ class TCPClientSocketPool : public ClientSocketPool {
 
 }  // namespace net
 
-#endif  // NET_BASE_TCP_CLIENT_SOCKET_POOL_H_
+#endif  // NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_
diff --git a/net/base/tcp_client_socket_pool_unittest.cc b/net/socket/tcp_client_socket_pool_unittest.cc
index 7892cb0..2bcc244 100644
--- a/net/base/tcp_client_socket_pool_unittest.cc
+++ b/net/socket/tcp_client_socket_pool_unittest.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/tcp_client_socket_pool.h"
+#include "net/socket/tcp_client_socket_pool.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
-#include "net/base/client_socket.h"
-#include "net/base/client_socket_factory.h"
-#include "net/base/client_socket_handle.h"
 #include "net/base/host_resolver_unittest.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
+#include "net/socket/client_socket.h"
+#include "net/socket/client_socket_factory.h"
+#include "net/socket/client_socket_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
diff --git a/net/base/tcp_client_socket_unittest.cc b/net/socket/tcp_client_socket_unittest.cc
index 21f524e..519d938 100644
--- a/net/base/tcp_client_socket_unittest.cc
+++ b/net/socket/tcp_client_socket_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/tcp_client_socket.h"
+#include "net/socket/tcp_client_socket.h"
 
 #include "base/basictypes.h"
 #include "net/base/address_list.h"
diff --git a/net/base/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc
index d073485..aa0e68c 100644
--- a/net/base/tcp_client_socket_win.cc
+++ b/net/socket/tcp_client_socket_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/tcp_client_socket_win.h"
+#include "net/socket/tcp_client_socket_win.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
diff --git a/net/base/tcp_client_socket_win.h b/net/socket/tcp_client_socket_win.h
index 87a5a83..492b106 100644
--- a/net/base/tcp_client_socket_win.h
+++ b/net/socket/tcp_client_socket_win.h
@@ -2,15 +2,15 @@
 // 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_WIN_H_
-#define NET_BASE_TCP_CLIENT_SOCKET_WIN_H_
+#ifndef NET_SOCKET_TCP_CLIENT_SOCKET_WIN_H_
+#define NET_SOCKET_TCP_CLIENT_SOCKET_WIN_H_
 
 #include <ws2tcpip.h>
 
 #include "base/object_watcher.h"
 #include "net/base/address_list.h"
-#include "net/base/client_socket.h"
 #include "net/base/completion_callback.h"
+#include "net/socket/client_socket.h"
 
 namespace net {
 
@@ -74,4 +74,4 @@ class TCPClientSocketWin : public ClientSocket {
 
 }  // namespace net
 
-#endif  // NET_BASE_TCP_CLIENT_SOCKET_WIN_H_
+#endif  // NET_SOCKET_TCP_CLIENT_SOCKET_WIN_H_
diff --git a/net/base/tcp_pinger.h b/net/socket/tcp_pinger.h
index fe81c94..0b0bd9b 100644
--- a/net/base/tcp_pinger.h
+++ b/net/socket/tcp_pinger.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_TCP_PINGER_H_
-#define NET_BASE_TCP_PINGER_H_
+#ifndef NET_SOCKET_TCP_PINGER_H_
+#define NET_SOCKET_TCP_PINGER_H_
 
 #include "base/compiler_specific.h"
 #include "base/ref_counted.h"
@@ -14,10 +14,10 @@
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "net/base/tcp_client_socket.h"
+#include "net/socket/tcp_client_socket.h"
 
 namespace base {
-  class TimeDelta;
+class TimeDelta;
 }
 
 namespace net {
@@ -129,4 +129,4 @@ class TCPPinger {
 
 }  // namespace net
 
-#endif  // NET_BASE_TCP_PINGER_H_
+#endif  // NET_SOCKET_TCP_PINGER_H_
diff --git a/net/base/tcp_pinger_unittest.cc b/net/socket/tcp_pinger_unittest.cc
index d09f42a..1d94ddd 100644
--- a/net/base/tcp_pinger_unittest.cc
+++ b/net/socket/tcp_pinger_unittest.cc
@@ -8,9 +8,9 @@
 #include "net/base/host_resolver.h"
 #include "net/base/listen_socket.h"
 #include "net/base/net_errors.h"
-#include "net/base/tcp_client_socket.h"
-#include "net/base/tcp_pinger.h"
 #include "net/base/winsock_init.h"
+#include "net/socket/tcp_client_socket.h"
+#include "net/socket/tcp_pinger.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc
index 6e86a88..68022f2 100644
--- a/net/tools/fetch/fetch_client.cc
+++ b/net/tools/fetch/fetch_client.cc
@@ -8,7 +8,6 @@
 #include "base/singleton.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
-#include "net/base/client_socket_factory.h"
 #include "net/base/completion_callback.h"
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
@@ -18,6 +17,7 @@
 #include "net/http/http_request_info.h"
 #include "net/http/http_transaction.h"
 #include "net/proxy/proxy_service.h"
+#include "net/socket/client_socket_factory.h"
 
 void usage(const char* program_name) {
   printf("usage: %s --url=<url>  [--n=<clients>] [--stats] [--use_cache]\n",
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index fa29d32..22277f4 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -27,12 +27,12 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_module.h"
 #include "net/base/net_util.h"
-#include "net/base/ssl_test_util.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_response_headers.h"
 #include "net/proxy/proxy_service.h"
+#include "net/socket/ssl_test_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index eddb51d..a4ec2fe 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -24,8 +24,8 @@
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
-#include "net/base/ssl_test_util.h"
 #include "net/http/http_network_layer.h"
+#include "net/socket/ssl_test_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/proxy/proxy_service.h"