diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 21:10:27 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 21:10:27 +0000 |
| commit | 0007f1434eafa4e955ff916d50a7a39fd850d435 (patch) | |
| tree | 278dca04911fbefee519ac7ab449d208f4938a3d /net/net.gyp | |
| parent | 41c9921ad0ffa548263262477777e865cd85b144 (diff) | |
| download | chromium_src-0007f1434eafa4e955ff916d50a7a39fd850d435.zip chromium_src-0007f1434eafa4e955ff916d50a7a39fd850d435.tar.gz chromium_src-0007f1434eafa4e955ff916d50a7a39fd850d435.tar.bz2 | |
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
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
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', |