From 7258defe34a4482e53ed23d2e04bb8d4fe7b4002 Mon Sep 17 00:00:00 2001 From: "joi@chromium.org" Date: Tue, 17 May 2011 19:53:00 +0000 Subject: 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 --- net/proxy/proxy_script_fetcher_impl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'net/proxy/proxy_script_fetcher_impl.h') diff --git a/net/proxy/proxy_script_fetcher_impl.h b/net/proxy/proxy_script_fetcher_impl.h index 419293f..8e9ca3b 100644 --- a/net/proxy/proxy_script_fetcher_impl.h +++ b/net/proxy/proxy_script_fetcher_impl.h @@ -45,9 +45,9 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher, // ProxyScriptFetcher methods: virtual int Fetch(const GURL& url, string16* text, - CompletionCallback* callback); - virtual void Cancel(); - virtual URLRequestContext* GetRequestContext(); + CompletionCallback* callback) OVERRIDE; + virtual void Cancel() OVERRIDE; + virtual URLRequestContext* GetRequestContext() const OVERRIDE; // URLRequest::Delegate methods: virtual void OnAuthRequired(URLRequest* request, -- cgit v1.1