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

net/net.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 25 matching lines @@
         'base/base64.cc',
         'base/base64.h',
         'base/bzip2_filter.cc',
         'base/bzip2_filter.h',
         'base/cache_type.h',
         'base/cert_status_flags.cc',
         'base/cert_status_flags.h',
         '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',
         'base/cookie_monster.cc',
         'base/cookie_monster.h',
         'base/cookie_policy.cc',
         'base/cookie_policy.h',
         'base/data_url.cc',
         'base/data_url.h',
         'base/directory_lister.cc',
@@ skipping 44 matching lines @@
         'base/platform_mime_util_linux.cc',
         'base/platform_mime_util_mac.cc',
         'base/platform_mime_util_win.cc',
         'base/registry_controlled_domain.cc',
         'base/registry_controlled_domain.h',
         'base/scoped_cert_chain_context.h',
         'base/sdch_filter.cc',
         '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',
         'base/upload_data.h',
         'base/upload_data_stream.cc',
         'base/upload_data_stream.h',
         'base/wininet_util.cc',
         'base/wininet_util.h',
         'base/winsock_init.cc',
         'base/winsock_init.h',
@@ skipping 126 matching lines @@
         'proxy/proxy_resolver_v8.h',
         'proxy/proxy_resolver_winhttp.cc',
         'proxy/proxy_resolver_winhttp.h',
         'proxy/proxy_retry_info.h',
         'proxy/proxy_script_fetcher.cc',
         'proxy/proxy_script_fetcher.h',
         'proxy/proxy_server.cc',
         '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',
         'url_request/url_request_about_job.h',
         'url_request/url_request_context.h',
         'url_request/url_request_error_job.cc',
         'url_request/url_request_error_job.h',
         'url_request/url_request_file_dir_job.cc',
         'url_request/url_request_file_dir_job.h',
         'url_request/url_request_file_job.cc',
@@ skipping 40 matching lines @@
         [ 'OS == "linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gdk',
             '../build/linux/system.gyp:nss',
           ],
         }],
         [ 'OS == "win"', {
             'sources/': [ ['exclude', '_(mac|linux|posix)\\.cc$'] ],
             'sources!': [
-              'base/tcp_client_socket_libevent.cc',
+              'socket/tcp_client_socket_libevent.cc',
             ],
             'dependencies': [
               'tld_cleanup',
             ],
             'configurations': {
               'Debug': {
                 'msvs_precompiled_header': 'build/precompiled_net.h',
                 'msvs_precompiled_source': 'build/precompiled_net.cc',
               },
             },
           },
           {  # else: OS != "win"
             'sources!': [
               'base/ssl_config_service.cc',
               'base/wininet_util.cc',
               'base/winsock_init.cc',
               'proxy/proxy_resolver_winhttp.cc',
               'url_request/url_request_ftp_job.cc',
               'url_request/url_request_inet_job.cc',
             ],
           },
         ],
         [ 'OS == "linux"', {
             'sources/': [ ['exclude', '_(mac|win)\\.cc$'] ],
           },
           {  # 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': [
               '../third_party/icu38/icu38.gyp:icui18n',
               '../third_party/icu38/icu38.gyp:icuuc',
             ],
           },
         ],
         [ 'OS == "mac"', {
             'sources/': [ ['exclude', '_(linux|win)\\.cc$'] ],
@@ skipping 35 matching lines @@
         'base/host_resolver_unittest.cc',
         'base/listen_socket_unittest.cc',
         'base/listen_socket_unittest.h',
         'base/mime_sniffer_unittest.cc',
         'base/mime_util_unittest.cc',
         'base/net_util_unittest.cc',
         'base/registry_controlled_domain_unittest.cc',
         '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',
         'base/x509_certificate_unittest.cc',
         'disk_cache/addr_unittest.cc',
         'disk_cache/backend_unittest.cc',
         'disk_cache/bitmap_unittest.cc',
         'disk_cache/block_files_unittest.cc',
         'disk_cache/disk_cache_test_base.cc',
         'disk_cache/disk_cache_test_base.h',
@@ skipping 18 matching lines @@
         'http/http_util_unittest.cc',
         'http/http_vary_data_unittest.cc',
         'proxy/proxy_config_service_linux_unittest.cc',
         'proxy/proxy_config_service_win_unittest.cc',
         'proxy/proxy_config_unittest.cc',
         'proxy/proxy_list_unittest.cc',
         'proxy/proxy_resolver_v8_unittest.cc',
         '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',
       ],
       'conditions': [
         [ 'OS == "win"', {
             'sources/': [ ['exclude', '_(mac|linux|posix)_unittest\\.cc$'] ],
           },
         ],
         [ 'OS != "win"', {
             'sources!': [
@@ skipping 95 matching lines @@
     },
     {
       'target_name': 'net_test_support',
       'type': '<(library)',
       'dependencies': [
         'net',
         '../base/base.gyp:base',
         '../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',
       ],
     },
     {
       'target_name': 'net_resources',
       'type': 'none',
       'msvs_guid': '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942',
       'rules': [
         {
           'rule_name': 'grit',
           'extension': 'grd',
@@ skipping 73 matching lines @@
           'sources': [
             'tools/dump_cache/dump_cache.cc',
             'tools/dump_cache/dump_files.cc',
             'tools/dump_cache/upgrade.cc',
           ],
         },
       ],
     }],
   ],
 }