From 0007f1434eafa4e955ff916d50a7a39fd850d435 Mon Sep 17 00:00:00 2001 From: "eroman@chromium.org" Date: Thu, 8 Jul 2010 21:10:27 +0000 Subject: Revert 51877, since SpdyNetworkTransactionTest.CorruptFrameSessionError started failing after this check-in (but only on vista modules builder). BUG=48588 Original CL description: Add the capability to run multiple proxy PAC scripts in parallel. Refactors SingleThreadedProxyResolver into MultiThreadedProxyResolver. New threads are created lazily on demand, up to a fixed maximum. Note that this CL does NOT change the policy in Chrome -- it will continue to use a single thread for proxy resolving, but using the new code to do so. BUG=11079 Review URL: http://codereview.chromium.org/2822043 TBR=eroman@chromium.org Review URL: http://codereview.chromium.org/2945004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51893 0039d316-1c4b-4281-b951-d872f2087c98 --- net/net.gyp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'net/net.gyp') diff --git a/net/net.gyp b/net/net.gyp index f18dfaa..d6f1921 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -396,8 +396,6 @@ 'ocsp/nss_ocsp.h', 'proxy/init_proxy_resolver.cc', 'proxy/init_proxy_resolver.h', - 'proxy/multi_threaded_proxy_resolver.cc', - 'proxy/multi_threaded_proxy_resolver.h', 'proxy/proxy_bypass_rules.cc', 'proxy/proxy_bypass_rules.h', 'proxy/proxy_config.cc', @@ -433,6 +431,8 @@ 'proxy/proxy_server.h', 'proxy/proxy_service.cc', 'proxy/proxy_service.h', + 'proxy/single_threaded_proxy_resolver.cc', + 'proxy/single_threaded_proxy_resolver.h', 'proxy/sync_host_resolver_bridge.cc', 'proxy/sync_host_resolver_bridge.h', 'socket/client_socket.h', @@ -723,7 +723,6 @@ 'http/url_security_manager_unittest.cc', 'proxy/init_proxy_resolver_unittest.cc', 'proxy/mock_proxy_resolver.h', - 'proxy/multi_threaded_proxy_resolver_unittest.cc', 'proxy/proxy_bypass_rules_unittest.cc', 'proxy/proxy_config_service_linux_unittest.cc', 'proxy/proxy_config_service_win_unittest.cc', @@ -734,6 +733,7 @@ 'proxy/proxy_script_fetcher_unittest.cc', 'proxy/proxy_server_unittest.cc', 'proxy/proxy_service_unittest.cc', + 'proxy/single_threaded_proxy_resolver_unittest.cc', 'proxy/sync_host_resolver_bridge_unittest.cc', 'socket/client_socket_pool_base_unittest.cc', 'socket/socks5_client_socket_unittest.cc', -- cgit v1.1