diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-17 19:53:00 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-17 19:53:00 +0000 |
| commit | 7258defe34a4482e53ed23d2e04bb8d4fe7b4002 (patch) | |
| tree | 57606849c4e643f9c08337d431227276ebb6dadd /net/net.gyp | |
| parent | 7ae3de9741146e4f429123e4980733be4c52e66d (diff) | |
| download | chromium_src-7258defe34a4482e53ed23d2e04bb8d4fe7b4002.zip chromium_src-7258defe34a4482e53ed23d2e04bb8d4fe7b4002.tar.gz chromium_src-7258defe34a4482e53ed23d2e04bb8d4fe7b4002.tar.bz2 | |
Adds support for the DHCP portion of the WPAD (proxy auto-discovery) protocol.
This is Windows-only for now, and is disabled by default. Start
Chrome with the flag --enable-dhcp-wpad to enable the feature. See
discussion in comment on DhcpProxyScriptFetcherFactory for why this
needs to be done in a per-platform way rather than cross-platform.
The code is factored so that adding other platform implementations
will be straight forward.
Most of the implementation is stand-alone and extends the
ScriptProxyFetcher class hierarchy (and makes its interface slightly
more generic). The integration point into existing code is in
InitProxyResolver, which previously handled fallback from DNS
auto-detect to custom PAC URL and now does fallback from DHCP to DNS
to custom PAC URL.
BUG=18575
TEST=net_unittests has good coverage for the new and changed code, but
manual tests on a network with a PAC URL configured in DHCP are also
needed.
Original commit r85646.
Reverted (test failures on some release bots) r85648.
Will reland with fix.
Review URL: http://codereview.chromium.org/6831025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 4aeea97..979ff9e 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -407,6 +407,16 @@ 'http/proxy_client_socket.h', 'ocsp/nss_ocsp.cc', 'ocsp/nss_ocsp.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', @@ -913,6 +923,9 @@ 'http/mock_sspi_library_win.h', 'http/mock_sspi_library_win.cc', 'http/url_security_manager_unittest.cc', + 'proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc', + 'proxy/dhcp_proxy_script_fetcher_factory_unittest.cc', + 'proxy/dhcp_proxy_script_fetcher_win_unittest.cc', 'proxy/init_proxy_resolver_unittest.cc', 'proxy/multi_threaded_proxy_resolver_unittest.cc', 'proxy/network_delegate_error_observer_unittest.cc', @@ -1128,6 +1141,8 @@ 'disk_cache/disk_cache_test_util.h', 'proxy/mock_proxy_resolver.cc', 'proxy/mock_proxy_resolver.h', + 'proxy/mock_proxy_script_fetcher.cc', + 'proxy/mock_proxy_script_fetcher.h', 'proxy/proxy_config_service_common_unittest.cc', 'proxy/proxy_config_service_common_unittest.h', 'socket/socket_test_util.cc', |