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

android_webview/browser/aw_devtools_delegate.cc

@@ -13,7 +13,7 @@
 #include "content/public/browser/devtools_http_handler.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
-#include "net/base/unix_domain_socket_posix.h"
+#include "net/socket/unix_domain_socket_posix.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {

chrome/browser/android/dev_tools_server.cc

@@ -4,8 +4,8 @@
 
 #include "chrome/browser/android/dev_tools_server.h"
 
-#include <cstring>
 #include <pwd.h>
+#include <cstring>
 
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
@@ -21,9 +21,9 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_http_handler.h"
 #include "content/public/browser/devtools_http_handler_delegate.h"
-#include "jni/DevToolsServer_jni.h"
 #include "grit/devtools_discovery_page_resources.h"
-#include "net/base/unix_domain_socket_posix.h"
+#include "jni/DevToolsServer_jni.h"
+#include "net/socket/unix_domain_socket_posix.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/resource/resource_bundle.h"
 

chrome/browser/devtools/devtools_sanity_browsertest.cc

@@ -44,7 +44,7 @@
 #include "content/public/browser/worker_service_observer.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
-#include "net/base/tcp_listen_socket.h"
+#include "net/socket/tcp_listen_socket.h"
 #include "net/test/test_server.h"
 
 using content::BrowserThread;

chrome/browser/devtools/remote_debugging_server.cc

@@ -7,7 +7,7 @@
 #include "chrome/browser/devtools/browser_list_tabcontents_provider.h"
 #include "chrome/browser/ui/webui/devtools_ui.h"
 #include "content/public/browser/devtools_http_handler.h"
-#include "net/base/tcp_listen_socket.h"
+#include "net/socket/tcp_listen_socket.h"
 
 RemoteDebuggingServer::RemoteDebuggingServer(
     Profile* profile,

chrome/browser/google_apis/test_server/http_connection.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/google_apis/test_server/http_connection.h"
 
 #include "chrome/browser/google_apis/test_server/http_response.h"
-#include "net/base/stream_listen_socket.h"
+#include "net/socket/stream_listen_socket.h"
 
 namespace google_apis {
 namespace test_server {

chrome/browser/google_apis/test_server/http_server.h

@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/tcp_listen_socket.h"
+#include "net/socket/tcp_listen_socket.h"
 
 namespace google_apis {
 namespace test_server {

chrome/browser/nacl_host/nacl_process_host.cc

@@ -46,7 +46,7 @@
 #include "ipc/ipc_switches.h"
 #include "native_client/src/shared/imc/nacl_imc_c.h"
 #include "net/base/net_util.h"
-#include "net/base/tcp_listen_socket.h"
+#include "net/socket/tcp_listen_socket.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
 #if defined(OS_POSIX)

chrome/browser/nacl_host/nacl_process_host.h

@@ -18,7 +18,7 @@
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel_handle.h"
-#include "net/base/tcp_listen_socket.h"
+#include "net/socket/tcp_listen_socket.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
 class ChromeRenderMessageFilter;

chrome/test/chromedriver/net/net_util_unittest.cc

@@ -18,9 +18,9 @@
 #include "chrome/test/chromedriver/net/url_request_context_getter.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
-#include "net/base/tcp_listen_socket.h"
 #include "net/server/http_server.h"
 #include "net/server/http_server_request_info.h"
+#include "net/socket/tcp_listen_socket.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/test/chromedriver/net/test_http_server.cc

@@ -12,8 +12,8 @@
 #include "base/time.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
-#include "net/base/tcp_listen_socket.h"
 #include "net/server/http_server_request_info.h"
+#include "net/socket/tcp_listen_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TestHttpServer::TestHttpServer()

chrome_frame/test/test_server.cc

@@ -16,9 +16,9 @@
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
-#include "net/base/tcp_listen_socket.h"
 #include "net/base/winsock_init.h"
 #include "net/http/http_util.h"
+#include "net/socket/tcp_listen_socket.h"
 
 namespace test_server {
 const char kDefaultHeaderTemplate[] =

chrome_frame/test/test_server.h

@@ -42,7 +42,7 @@
 #include "base/files/file_path.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/message_loop.h"
-#include "net/base/stream_listen_socket.h"
+#include "net/socket/stream_listen_socket.h"
 
 namespace test_server {
 

chrome_frame/test/test_with_web_server.cc

@@ -15,18 +15,18 @@
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/installer/util/product.h"
-#include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/helper.h"
+#include "chrome/installer/util/install_util.h"
+#include "chrome/installer/util/product.h"
 #include "chrome_frame/html_utils.h"
-#include "chrome_frame/utils.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
 #include "chrome_frame/test/mock_ie_event_sink_test.h"
 #include "chrome_frame/test/test_scrubber.h"
+#include "chrome_frame/utils.h"
 #include "net/base/mime_util.h"
-#include "net/base/stream_listen_socket.h"
 #include "net/http/http_util.h"
+#include "net/socket/stream_listen_socket.h"
 
 using chrome_frame_test::kChromeFrameLongNavigationTimeout;
 using chrome_frame_test::kChromeFrameVeryLongNavigationTimeout;

content/browser/devtools/devtools_http_handler_unittest.cc

@@ -7,7 +7,7 @@
 #include "content/browser/browser_thread_impl.h"
 #include "content/public/browser/devtools_http_handler.h"
 #include "content/public/browser/devtools_http_handler_delegate.h"
-#include "net/base/stream_listen_socket.h"
+#include "net/socket/stream_listen_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {

content/shell/shell_devtools_delegate.cc

@@ -10,12 +10,12 @@
 #include "content/public/common/url_constants.h"
 #include "content/shell/shell.h"
 #include "grit/shell_resources.h"
-#include "net/base/tcp_listen_socket.h"
+#include "net/socket/tcp_listen_socket.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/browser/android/devtools_auth.h"
-#include "net/base/unix_domain_socket_posix.h"
+#include "net/socket/unix_domain_socket_posix.h"
 
 namespace {
 const char kSocketName[] = "content_shell_devtools_remote";

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', {

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 {
 

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 {
 

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 {
 

net/base/stream_listen_socket.cc → 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
 

net/base/stream_listen_socket.h → 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_

net/base/tcp_listen_socket.cc → 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
 

net/base/tcp_listen_socket.h → 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_

net/base/tcp_listen_socket_unittest.cc → 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>

net/base/tcp_listen_socket_unittest.h → 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 {

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"
 

net/base/unix_domain_socket_posix.cc → 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>

net/base/unix_domain_socket_posix.h → 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_

net/base/unix_domain_socket_posix_unittest.cc → 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;

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;

tools/android/forwarder2/socket.cc

@@ -122,7 +122,7 @@ bool Socket::InitUnixSocket(const std::string& path, bool abstract) {
   family_ = PF_UNIX;
   addr_.addr_un.sun_family = family_;
   if (abstract) {
-    // Copied from net/base/unix_domain_socket_posix.cc
+    // Copied from net/socket/unix_domain_socket_posix.cc
     // Convert the path given into abstract socket name. It must start with
     // the '\0' character, so we are adding it. |addr_len| must specify the
     // length of the structure exactly, as potentially the socket name may