Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 7737034: Revert 99677 (didn't help) - Revert 99666 (sync tests started failing on mac10.6: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/network_change_notifier_linux.cc ('k') | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
===================================================================
--- net/net.gyp (revision 99692)
+++ net/net.gyp (working copy)
@@ -82,16 +82,16 @@
'base/default_origin_bound_cert_store.h',
'base/directory_lister.cc',
'base/directory_lister.h',
- 'base/dns_reload_timer.cc',
- 'base/dns_reload_timer.h',
+ 'base/dns_reloader.cc',
+ 'base/dns_reloader.h',
+ 'base/dns_util.cc',
+ 'base/dns_util.h',
+ 'base/dnsrr_resolver.cc',
+ 'base/dnsrr_resolver.h',
'base/dnssec_chain_verifier.cc',
'base/dnssec_chain_verifier.h',
'base/dnssec_keyset.cc',
'base/dnssec_keyset.h',
- 'base/dns_util.cc',
- 'base/dns_util.h',
- 'base/dnsrr_resolver.cc',
- 'base/dnsrr_resolver.h',
'base/escape.cc',
'base/escape.h',
'base/escape_icu.cc',
@@ -209,6 +209,8 @@
'base/ssl_info.h',
'base/static_cookie_policy.cc',
'base/static_cookie_policy.h',
+ 'base/sys_addrinfo.h',
+ 'base/sys_byteorder.h',
'base/test_data_stream.cc',
'base/test_data_stream.h',
'base/test_root_certs.cc',
@@ -219,8 +221,6 @@
'base/test_root_certs_win.cc',
'base/transport_security_state.cc',
'base/transport_security_state.h',
- 'base/sys_addrinfo.h',
- 'base/sys_byteorder.h',
'base/upload_data.cc',
'base/upload_data.h',
'base/upload_data_stream.cc',
@@ -229,15 +229,15 @@
'base/winsock_init.h',
'base/winsock_util.cc',
'base/winsock_util.h',
+ 'base/x509_cert_types.cc',
+ 'base/x509_cert_types.h',
+ 'base/x509_cert_types_mac.cc',
'base/x509_certificate.cc',
'base/x509_certificate.h',
'base/x509_certificate_mac.cc',
'base/x509_certificate_nss.cc',
'base/x509_certificate_openssl.cc',
'base/x509_certificate_win.cc',
- 'base/x509_cert_types.cc',
- 'base/x509_cert_types.h',
- 'base/x509_cert_types_mac.cc',
'base/x509_util_openssl.cc',
'base/x509_util_openssl.h',
'disk_cache/addr.cc',
@@ -260,8 +260,6 @@
'disk_cache/eviction.cc',
'disk_cache/eviction.h',
'disk_cache/experiments.h',
- 'disk_cache/net_log_parameters.cc',
- 'disk_cache/net_log_parameters.h',
'disk_cache/file.cc',
'disk_cache/file.h',
'disk_cache/file_block.h',
@@ -285,6 +283,8 @@
'disk_cache/mem_entry_impl.h',
'disk_cache/mem_rankings.cc',
'disk_cache/mem_rankings.h',
+ 'disk_cache/net_log_parameters.cc',
+ 'disk_cache/net_log_parameters.h',
'disk_cache/rankings.cc',
'disk_cache/rankings.h',
'disk_cache/sparse_control.cc',
@@ -370,8 +370,8 @@
'http/http_auth_handler_digest.h',
'http/http_auth_handler_factory.cc',
'http/http_auth_handler_factory.h',
+ 'http/http_auth_handler_negotiate.cc',
'http/http_auth_handler_negotiate.h',
- 'http/http_auth_handler_negotiate.cc',
'http/http_auth_handler_ntlm.cc',
'http/http_auth_handler_ntlm.h',
'http/http_auth_handler_ntlm_portable.cc',
@@ -400,6 +400,12 @@
'http/http_network_session_peer.h',
'http/http_network_transaction.cc',
'http/http_network_transaction.h',
+ 'http/http_proxy_client_socket.cc',
+ 'http/http_proxy_client_socket.h',
+ 'http/http_proxy_client_socket_pool.cc',
+ 'http/http_proxy_client_socket_pool.h',
+ 'http/http_proxy_utils.cc',
+ 'http/http_proxy_utils.h',
'http/http_request_headers.cc',
'http/http_request_headers.h',
'http/http_request_info.cc',
@@ -423,19 +429,9 @@
'http/http_stream_parser.h',
'http/http_transaction.h',
'http/http_transaction_factory.h',
- 'http/url_security_manager.h',
- 'http/url_security_manager.cc',
- 'http/url_security_manager_posix.cc',
- 'http/url_security_manager_win.cc',
- 'http/http_proxy_client_socket.cc',
- 'http/http_proxy_client_socket.h',
- 'http/http_proxy_client_socket_pool.cc',
- 'http/http_proxy_client_socket_pool.h',
- 'http/http_proxy_utils.cc',
- 'http/http_proxy_utils.h',
'http/http_util.cc',
+ 'http/http_util.h',
'http/http_util_icu.cc',
- 'http/http_util.h',
'http/http_vary_data.cc',
'http/http_vary_data.h',
'http/http_version.h',
@@ -444,14 +440,18 @@
'http/partial_data.cc',
'http/partial_data.h',
'http/proxy_client_socket.h',
+ 'http/url_security_manager.cc',
+ 'http/url_security_manager.h',
+ 'http/url_security_manager_posix.cc',
+ 'http/url_security_manager_win.cc',
'ocsp/nss_ocsp.cc',
'ocsp/nss_ocsp.h',
+ 'proxy/dhcp_proxy_script_adapter_fetcher_win.cc',
+ 'proxy/dhcp_proxy_script_adapter_fetcher_win.h',
'proxy/dhcp_proxy_script_fetcher.cc',
'proxy/dhcp_proxy_script_fetcher.h',
'proxy/dhcp_proxy_script_fetcher_factory.cc',
'proxy/dhcp_proxy_script_fetcher_factory.h',
- 'proxy/dhcp_proxy_script_adapter_fetcher_win.cc',
- 'proxy/dhcp_proxy_script_adapter_fetcher_win.h',
'proxy/dhcp_proxy_script_fetcher_win.cc',
'proxy/dhcp_proxy_script_fetcher_win.h',
'proxy/dhcpcsvc_init_win.cc',
@@ -500,8 +500,8 @@
'proxy/proxy_script_fetcher_impl.cc',
'proxy/proxy_script_fetcher_impl.h',
'proxy/proxy_server.cc',
+ 'proxy/proxy_server.h',
'proxy/proxy_server_mac.cc',
- 'proxy/proxy_server.h',
'proxy/proxy_service.cc',
'proxy/proxy_service.h',
'proxy/sync_host_resolver.h',
@@ -511,8 +511,8 @@
'socket/client_socket_factory.h',
'socket/client_socket_handle.cc',
'socket/client_socket_handle.h',
+ 'socket/client_socket_pool.cc',
'socket/client_socket_pool.h',
- 'socket/client_socket_pool.cc',
'socket/client_socket_pool_base.cc',
'socket/client_socket_pool_base.h',
'socket/client_socket_pool_histograms.cc',
@@ -545,12 +545,12 @@
'socket/ssl_client_socket_win.h',
'socket/ssl_error_params.cc',
'socket/ssl_error_params.h',
+ 'socket/ssl_host_info.cc',
+ 'socket/ssl_host_info.h',
'socket/ssl_server_socket.h',
'socket/ssl_server_socket_nss.cc',
'socket/ssl_server_socket_nss.h',
'socket/ssl_server_socket_openssl.cc',
- 'socket/ssl_host_info.cc',
- 'socket/ssl_host_info.h',
'socket/stream_socket.cc',
'socket/stream_socket.h',
'socket/tcp_client_socket.cc',
@@ -602,10 +602,10 @@
'spdy/spdy_websocket_stream.h',
'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
'third_party/mozilla_security_manager/nsKeygenHandler.h',
+ 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
+ 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
- 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
'third_party/mozilla_security_manager/nsPKCS12Blob.h',
'udp/datagram_client_socket.h',
@@ -620,8 +620,8 @@
'udp/udp_socket_libevent.h',
'udp/udp_socket_win.cc',
'udp/udp_socket_win.h',
+ 'url_request/https_prober.cc',
'url_request/https_prober.h',
- 'url_request/https_prober.cc',
'url_request/url_request.cc',
'url_request/url_request.h',
'url_request/url_request_about_job.cc',
@@ -664,8 +664,8 @@
'url_request/url_request_throttler_entry.cc',
'url_request/url_request_throttler_entry.h',
'url_request/url_request_throttler_entry_interface.h',
+ 'url_request/url_request_throttler_header_adapter.cc',
'url_request/url_request_throttler_header_adapter.h',
- 'url_request/url_request_throttler_header_adapter.cc',
'url_request/url_request_throttler_header_interface.h',
'url_request/url_request_throttler_manager.cc',
'url_request/url_request_throttler_manager.h',
« no previous file with comments | « net/base/network_change_notifier_linux.cc ('k') | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698