net: move socket files from net/base to net/socket

BUG=70818

Review URL: https://codereview.chromium.org/13812005

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

15 files changed, 42 insertions, 42 deletions

diff --git a/net/net.gyp b/net/net.gyp
index 8886827..dc0ab80 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -210,15 +210,9 @@
         'base/sdch_manager.h',
         'base/static_cookie_policy.cc',
         'base/static_cookie_policy.h',
-        'base/stream_listen_socket.cc',
-        'base/stream_listen_socket.h',
         'base/sys_addrinfo.h',
-        'base/tcp_listen_socket.cc',
-        'base/tcp_listen_socket.h',
         'base/test_data_stream.cc',
         'base/test_data_stream.h',
-        'base/unix_domain_socket_posix.cc',
-        'base/unix_domain_socket_posix.h',
         'base/upload_bytes_element_reader.cc',
         'base/upload_bytes_element_reader.h',
         'base/upload_data.cc',
@@ -807,6 +801,8 @@
         'socket/ssl_server_socket_nss.h',
         'socket/ssl_server_socket_openssl.cc',
         'socket/ssl_socket.h',
+        'socket/stream_listen_socket.cc',
+        'socket/stream_listen_socket.h',
         'socket/stream_socket.cc',
         'socket/stream_socket.h',
         'socket/tcp_client_socket.cc',
@@ -815,6 +811,8 @@
         'socket/tcp_client_socket_libevent.h',
         'socket/tcp_client_socket_win.cc',
         'socket/tcp_client_socket_win.h',
+        'socket/tcp_listen_socket.cc',
+        'socket/tcp_listen_socket.h',
         'socket/tcp_server_socket.h',
         'socket/tcp_server_socket_libevent.cc',
         'socket/tcp_server_socket_libevent.h',
@@ -822,6 +820,8 @@
         'socket/tcp_server_socket_win.h',
         'socket/transport_client_socket_pool.cc',
         'socket/transport_client_socket_pool.h',
+        'socket/unix_domain_socket_posix.cc',
+        'socket/unix_domain_socket_posix.h',
         'socket_stream/socket_stream.cc',
         'socket_stream/socket_stream.h',
         'socket_stream/socket_stream_job.cc',
@@ -1413,10 +1413,7 @@
         'base/registry_controlled_domains/registry_controlled_domain_unittest.cc',
         'base/sdch_filter_unittest.cc',
         'base/static_cookie_policy_unittest.cc',
-        'base/tcp_listen_socket_unittest.cc',
-        'base/tcp_listen_socket_unittest.h',
         'base/test_completion_callback_unittest.cc',
-        'base/unix_domain_socket_posix_unittest.cc',
         'base/upload_bytes_element_reader_unittest.cc',
         'base/upload_data_stream_unittest.cc',
         'base/upload_file_element_reader_unittest.cc',
@@ -1625,9 +1622,12 @@
         'socket/ssl_client_socket_unittest.cc',
         'socket/ssl_server_socket_unittest.cc',
         'socket/tcp_client_socket_unittest.cc',
+        'socket/tcp_listen_socket_unittest.cc',
+        'socket/tcp_listen_socket_unittest.h',
         'socket/tcp_server_socket_unittest.cc',
         'socket/transport_client_socket_pool_unittest.cc',
         'socket/transport_client_socket_unittest.cc',
+        'socket/unix_domain_socket_posix_unittest.cc',
         'socket_stream/socket_stream_metrics_unittest.cc',
         'socket_stream/socket_stream_unittest.cc',
         'spdy/buffered_spdy_framer_spdy3_unittest.cc',
@@ -1880,7 +1880,7 @@
               # The following tests are disabled because they don't apply to
               # iOS.
               # OS is not "linux" or "freebsd" or "openbsd".
-              'base/unix_domain_socket_posix_unittest.cc',
+              'socket/unix_domain_socket_posix_unittest.cc',
             ],
             'conditions': [
               ['coverage != 0', {
diff --git a/net/server/http_connection.cc b/net/server/http_connection.cc
index e82c9fe..2bc9d4d 100644
--- a/net/server/http_connection.cc
+++ b/net/server/http_connection.cc
@@ -6,9 +6,9 @@
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "net/base/stream_listen_socket.h"
 #include "net/server/http_server.h"
 #include "net/server/web_socket.h"
+#include "net/socket/stream_listen_socket.h"
 
 namespace net {
 
diff --git a/net/server/http_server.cc b/net/server/http_server.cc
index b92c211..4f1fb08 100644
--- a/net/server/http_server.cc
+++ b/net/server/http_server.cc
@@ -11,10 +11,10 @@
 #include "base/stringprintf.h"
 #include "base/sys_byteorder.h"
 #include "build/build_config.h"
-#include "net/base/tcp_listen_socket.h"
 #include "net/server/http_connection.h"
 #include "net/server/http_server_request_info.h"
 #include "net/server/web_socket.h"
+#include "net/socket/tcp_listen_socket.h"
 
 namespace net {
 
diff --git a/net/server/http_server.h b/net/server/http_server.h
index 54773ad..b5ba037 100644
--- a/net/server/http_server.h
+++ b/net/server/http_server.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/stream_listen_socket.h"
 #include "net/http/http_status_code.h"
+#include "net/socket/stream_listen_socket.h"
 
 namespace net {
 
diff --git a/net/base/stream_listen_socket.cc b/net/socket/stream_listen_socket.cc
index 7168df3..ade07db 100644
--- a/net/base/stream_listen_socket.cc
+++ b/net/socket/stream_listen_socket.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/stream_listen_socket.h"
+#include "net/socket/stream_listen_socket.h"
 
 #if defined(OS_WIN)
 // winsock2.h must be included first in order to ensure it is included before
 // windows.h.
 #include <winsock2.h>
 #elif defined(OS_POSIX)
+#include <arpa/inet.h>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #include "net/base/net_errors.h"
 #endif
 
diff --git a/net/base/stream_listen_socket.h b/net/socket/stream_listen_socket.h
index 96e8952..726d2ff 100644
--- a/net/base/stream_listen_socket.h
+++ b/net/socket/stream_listen_socket.h
@@ -13,8 +13,8 @@
 // thread always and that all other methods (including constructor and
 // destructor) should also be called from the same thread.
 
-#ifndef NET_BASE_STREAM_LISTEN_SOCKET_H_
-#define NET_BASE_STREAM_LISTEN_SOCKET_H_
+#ifndef NET_SOCKET_STREAM_LISTEN_SOCKET_H_
+#define NET_SOCKET_STREAM_LISTEN_SOCKET_H_
 
 #include "build/build_config.h"
 
@@ -31,7 +31,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "net/base/net_export.h"
-#include "net/base/stream_listen_socket.h"
+#include "net/socket/stream_listen_socket.h"
 
 #if defined(OS_POSIX)
 typedef int SocketDescriptor;
@@ -152,4 +152,4 @@ class NET_EXPORT StreamListenSocketFactory {
 
 }  // namespace net
 
-#endif  // NET_BASE_STREAM_LISTEN_SOCKET_H_
+#endif  // NET_SOCKET_STREAM_LISTEN_SOCKET_H_
diff --git a/net/base/tcp_listen_socket.cc b/net/socket/tcp_listen_socket.cc
index c264eba..9484cb9 100644
--- a/net/base/tcp_listen_socket.cc
+++ b/net/socket/tcp_listen_socket.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/tcp_listen_socket.h"
+#include "net/socket/tcp_listen_socket.h"
 
 #if defined(OS_WIN)
 // winsock2.h must be included first in order to ensure it is included before
 // windows.h.
 #include <winsock2.h>
 #elif defined(OS_POSIX)
+#include <arpa/inet.h>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #include "net/base/net_errors.h"
 #endif
 
diff --git a/net/base/tcp_listen_socket.h b/net/socket/tcp_listen_socket.h
index 7466e60..dbc5347 100644
--- a/net/base/tcp_listen_socket.h
+++ b/net/socket/tcp_listen_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_LISTEN_SOCKET_H_
-#define NET_BASE_TCP_LISTEN_SOCKET_H_
+#ifndef NET_SOCKET_TCP_LISTEN_SOCKET_H_
+#define NET_SOCKET_TCP_LISTEN_SOCKET_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "net/base/net_export.h"
-#include "net/base/stream_listen_socket.h"
+#include "net/socket/stream_listen_socket.h"
 
 namespace net {
 
@@ -61,4 +61,4 @@ class NET_EXPORT TCPListenSocketFactory : public StreamListenSocketFactory {
 
 }  // namespace net
 
-#endif  // NET_BASE_TCP_LISTEN_SOCKET_H_
+#endif  // NET_SOCKET_TCP_LISTEN_SOCKET_H_
diff --git a/net/base/tcp_listen_socket_unittest.cc b/net/socket/tcp_listen_socket_unittest.cc
index a6e2e2f2..c862d33 100644
--- a/net/base/tcp_listen_socket_unittest.cc
+++ b/net/socket/tcp_listen_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_listen_socket_unittest.h"
+#include "net/socket/tcp_listen_socket_unittest.h"
 
 #include <fcntl.h>
 #include <sys/types.h>
diff --git a/net/base/tcp_listen_socket_unittest.h b/net/socket/tcp_listen_socket_unittest.h
index ba21263..59c299a 100644
--- a/net/base/tcp_listen_socket_unittest.h
+++ b/net/socket/tcp_listen_socket_unittest.h
@@ -10,9 +10,9 @@
 #if defined(OS_WIN)
 #include <winsock2.h>
 #elif defined(OS_POSIX)
-#include <sys/socket.h>
-#include <errno.h>
 #include <arpa/inet.h>
+#include <errno.h>
+#include <sys/socket.h>
 #endif
 
 #include "base/basictypes.h"
@@ -24,8 +24,8 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "net/base/net_util.h"
-#include "net/base/tcp_listen_socket.h"
 #include "net/base/winsock_init.h"
+#include "net/socket/tcp_listen_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
diff --git a/net/socket/transport_client_socket_unittest.cc b/net/socket/transport_client_socket_unittest.cc
index 5b85690..b5935e3 100644
--- a/net/socket/transport_client_socket_unittest.cc
+++ b/net/socket/transport_client_socket_unittest.cc
@@ -12,11 +12,11 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/net_log_unittest.h"
-#include "net/base/tcp_listen_socket.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/winsock_init.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/socket/client_socket_factory.h"
+#include "net/socket/tcp_listen_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/net/base/unix_domain_socket_posix.cc b/net/socket/unix_domain_socket_posix.cc
index 819b94c..3f65b08 100644
--- a/net/base/unix_domain_socket_posix.cc
+++ b/net/socket/unix_domain_socket_posix.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/unix_domain_socket_posix.h"
+#include "net/socket/unix_domain_socket_posix.h"
 
 #include <cstring>
 #include <string>
diff --git a/net/base/unix_domain_socket_posix.h b/net/socket/unix_domain_socket_posix.h
index 726a917..9660122 100644
--- a/net/base/unix_domain_socket_posix.h
+++ b/net/socket/unix_domain_socket_posix.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_UNIX_DOMAIN_SOCKET_POSIX_H_
-#define NET_BASE_UNIX_DOMAIN_SOCKET_POSIX_H_
+#ifndef NET_SOCKET_UNIX_DOMAIN_SOCKET_POSIX_H_
+#define NET_SOCKET_UNIX_DOMAIN_SOCKET_POSIX_H_
 
 #include <string>
 
@@ -13,7 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "net/base/net_export.h"
-#include "net/base/stream_listen_socket.h"
+#include "net/socket/stream_listen_socket.h"
 
 #if defined(OS_ANDROID) || defined(OS_LINUX)
 // Feature only supported on Linux currently. This lets the Unix Domain Socket
@@ -117,4 +117,4 @@ class NET_EXPORT UnixDomainSocketWithAbstractNamespaceFactory
 
 }  // namespace net
 
-#endif  // NET_BASE_UNIX_DOMAIN_SOCKET_POSIX_H_
+#endif  // NET_SOCKET_UNIX_DOMAIN_SOCKET_POSIX_H_
diff --git a/net/base/unix_domain_socket_posix_unittest.cc b/net/socket/unix_domain_socket_posix_unittest.cc
index 5352a7b..9cbaf9a 100644
--- a/net/base/unix_domain_socket_posix_unittest.cc
+++ b/net/socket/unix_domain_socket_posix_unittest.cc
@@ -29,7 +29,7 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
-#include "net/base/unix_domain_socket_posix.h"
+#include "net/socket/unix_domain_socket_posix.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::queue;
diff --git a/net/tools/fetch/http_listen_socket.h b/net/tools/fetch/http_listen_socket.h
index 3202e87..f4adea2 100644
--- a/net/tools/fetch/http_listen_socket.h
+++ b/net/tools/fetch/http_listen_socket.h
@@ -6,8 +6,8 @@
 #define NET_BASE_TOOLS_HTTP_LISTEN_SOCKET_H_
 
 #include "base/message_loop.h"
-#include "net/base/stream_listen_socket.h"
-#include "net/base/tcp_listen_socket.h"
+#include "net/socket/stream_listen_socket.h"
+#include "net/socket/tcp_listen_socket.h"
 
 class HttpServerRequestInfo;
 class HttpServerResponseInfo;