Revert 99677 (didn't help) - Revert 99666 (sync tests started failing on mac10.6:

net/net.gyp

 # Copyright (c) 2011 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,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 64 matching lines @@
         'base/crl_set.h',
         'base/crypto_module.h',
         'base/crypto_module_nss.cc',
         'base/crypto_module_openssl.cc',
         'base/data_url.cc',
         'base/data_url.h',
         'base/default_origin_bound_cert_store.cc',
         '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',
         'base/ev_root_ca_metadata.cc',
         'base/ev_root_ca_metadata.h',
         'base/file_stream.h',
         'base/file_stream_posix.cc',
         'base/file_stream_win.cc',
         'base/filter.cc',
         'base/filter.h',
@@ skipping 97 matching lines @@
         'base/ssl_client_auth_cache.h',
         'base/ssl_config_service.cc',
         'base/ssl_config_service.h',
         'base/ssl_config_service_defaults.cc',
         'base/ssl_config_service_defaults.h',
         'base/ssl_false_start_blacklist.cc',
         'base/ssl_info.cc',
         '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',
         'base/test_root_certs.h',
         'base/test_root_certs_mac.cc',
         'base/test_root_certs_nss.cc',
         'base/test_root_certs_openssl.cc',
         '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',
         'base/upload_data_stream.h',
         'base/winsock_init.cc',
         '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',
         'disk_cache/addr.h',
         'disk_cache/backend_impl.cc',
         'disk_cache/backend_impl.h',
         'disk_cache/bitmap.cc',
         'disk_cache/bitmap.h',
         'disk_cache/block_files.cc',
         'disk_cache/block_files.h',
         'disk_cache/cache_util.h',
         'disk_cache/cache_util_posix.cc',
         'disk_cache/cache_util_win.cc',
         'disk_cache/disk_cache.h',
         'disk_cache/disk_format.cc',
         'disk_cache/disk_format.h',
         'disk_cache/entry_impl.cc',
         'disk_cache/entry_impl.h',
         'disk_cache/errors.h',
         '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',
         'disk_cache/file_lock.cc',
         'disk_cache/file_lock.h',
         'disk_cache/file_posix.cc',
         'disk_cache/file_win.cc',
         'disk_cache/hash.cc',
         'disk_cache/hash.h',
         'disk_cache/histogram_macros.h',
         'disk_cache/in_flight_backend_io.cc',
         'disk_cache/in_flight_backend_io.h',
         'disk_cache/in_flight_io.cc',
         'disk_cache/in_flight_io.h',
         'disk_cache/mapped_file.h',
         'disk_cache/mapped_file_posix.cc',
         'disk_cache/mapped_file_win.cc',
         'disk_cache/mem_backend_impl.cc',
         'disk_cache/mem_backend_impl.h',
         'disk_cache/mem_entry_impl.cc',
         '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',
         'disk_cache/sparse_control.h',
         'disk_cache/stats.cc',
         'disk_cache/stats.h',
         'disk_cache/stats_histogram.cc',
         'disk_cache/stats_histogram.h',
         'disk_cache/storage_block-inl.h',
         'disk_cache/storage_block.h',
@@ skipping 65 matching lines @@
         'http/http_auth_gssapi_posix.cc',
         'http/http_auth_gssapi_posix.h',
         'http/http_auth_handler.cc',
         'http/http_auth_handler.h',
         'http/http_auth_handler_basic.cc',
         'http/http_auth_handler_basic.h',
         'http/http_auth_handler_digest.cc',
         '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',
         'http/http_auth_handler_ntlm_win.cc',
         'http/http_auth_sspi_win.cc',
         'http/http_auth_sspi_win.h',
         'http/http_basic_stream.cc',
         'http/http_basic_stream.h',
         'http/http_byte_range.cc',
         'http/http_byte_range.h',
         'http/http_cache.cc',
         'http/http_cache.h',
         'http/http_cache_transaction.cc',
         'http/http_cache_transaction.h',
         'http/http_chunked_decoder.cc',
         'http/http_chunked_decoder.h',
         'http/http_mac_signature.cc',
         'http/http_mac_signature.h',
         'http/http_net_log_params.cc',
         'http/http_net_log_params.h',
         'http/http_network_layer.cc',
         'http/http_network_layer.h',
         'http/http_network_session.cc',
         'http/http_network_session.h',
         'http/http_network_session_peer.cc',
         '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',
         'http/http_request_info.h',
         'http/http_response_body_drainer.cc',
         'http/http_response_body_drainer.h',
         'http/http_response_headers.cc',
         'http/http_response_headers.h',
         'http/http_response_info.cc',
         'http/http_response_info.h',
         'http/http_stream.h',
         'http/http_stream_factory.cc',
         'http/http_stream_factory.h',
         'http/http_stream_factory_impl.cc',
         'http/http_stream_factory_impl.h',
         'http/http_stream_factory_impl_job.cc',
         'http/http_stream_factory_impl_job.h',
         'http/http_stream_factory_impl_request.cc',
         'http/http_stream_factory_impl_request.h',
         'http/http_stream_parser.cc',
         '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',
         'http/md4.cc',
         'http/md4.h',
         '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',
         'proxy/dhcpcsvc_init_win.h',
         'proxy/init_proxy_resolver.cc',
         'proxy/init_proxy_resolver.h',
         'proxy/multi_threaded_proxy_resolver.cc',
         'proxy/multi_threaded_proxy_resolver.h',
         'proxy/network_delegate_error_observer.cc',
         'proxy/network_delegate_error_observer.h',
@@ skipping 28 matching lines @@
         'proxy/proxy_resolver_script_data.h',
         'proxy/proxy_resolver_v8.cc',
         'proxy/proxy_resolver_v8.h',
         'proxy/proxy_resolver_winhttp.cc',
         'proxy/proxy_resolver_winhttp.h',
         'proxy/proxy_retry_info.h',
         'proxy/proxy_script_fetcher.h',
         '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',
         'proxy/sync_host_resolver_bridge.cc',
         'proxy/sync_host_resolver_bridge.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.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',
         'socket/client_socket_pool_histograms.h',
         'socket/client_socket_pool_manager.cc',
         'socket/client_socket_pool_manager.h',
         'socket/dns_cert_provenance_checker.cc',
         'socket/dns_cert_provenance_checker.h',
         'socket/nss_ssl_util.cc',
         'socket/nss_ssl_util.h',
@@ skipping 12 matching lines @@
         'socket/ssl_client_socket_nss.cc',
         'socket/ssl_client_socket_nss.h',
         'socket/ssl_client_socket_openssl.cc',
         'socket/ssl_client_socket_openssl.h',
         'socket/ssl_client_socket_pool.cc',
         'socket/ssl_client_socket_pool.h',
         'socket/ssl_client_socket_win.cc',
         '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',
         'socket/tcp_client_socket.h',
         'socket/tcp_client_socket_libevent.cc',
         'socket/tcp_client_socket_libevent.h',
         'socket/tcp_client_socket_win.cc',
         'socket/tcp_client_socket_win.h',
         'socket/tcp_server_socket.h',
         'socket/tcp_server_socket_libevent.cc',
@@ skipping 31 matching lines @@
         'spdy/spdy_session_pool.cc',
         'spdy/spdy_session_pool.h',
         'spdy/spdy_settings_storage.cc',
         'spdy/spdy_settings_storage.h',
         'spdy/spdy_stream.cc',
         'spdy/spdy_stream.h',
         'spdy/spdy_websocket_stream.cc',
         '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',
         'udp/datagram_server_socket.h',
         'udp/datagram_socket.h',
         'udp/udp_client_socket.cc',
         'udp/udp_client_socket.h',
         'udp/udp_server_socket.cc',
         'udp/udp_server_socket.h',
         'udp/udp_socket.h',
         'udp/udp_socket_libevent.cc',
         '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',
         'url_request/url_request_about_job.h',
         'url_request/url_request_context.cc',
         'url_request/url_request_context.h',
         'url_request/url_request_context_getter.cc',
         'url_request/url_request_context_getter.h',
         'url_request/url_request_context_storage.cc',
         'url_request/url_request_context_storage.h',
@@ skipping 22 matching lines @@
         'url_request/url_request_redirect_job.cc',
         'url_request/url_request_redirect_job.h',
         'url_request/url_request_simple_job.cc',
         'url_request/url_request_simple_job.h',
         'url_request/url_request_status.h',
         'url_request/url_request_test_job.cc',
         'url_request/url_request_test_job.h',
         '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',
         'url_request/view_cache_helper.cc',
         'url_request/view_cache_helper.h',
         'websockets/websocket_frame_handler.cc',
         'websockets/websocket_frame_handler.h',
         'websockets/websocket_handshake_handler.cc',
         'websockets/websocket_handshake_handler.h',
         'websockets/websocket_job.cc',
@@ skipping 872 matching lines @@
             'tools/dump_cache/url_to_filename_encoder.cc',
             'tools/dump_cache/url_to_filename_encoder.h',
             'tools/dump_cache/url_utilities.h',
             'tools/dump_cache/url_utilities.cc',
           ],
         },
       ],
     }],
   ],
 }