diff options
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 59 |
1 files changed, 30 insertions, 29 deletions
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', ], }, { |