From 7505bca3ff31b21eb624189d0d83c905a7c1d82d Mon Sep 17 00:00:00 2001 From: "joi@chromium.org" Date: Tue, 24 May 2011 14:14:02 +0000 Subject: Make DHCP WPAD on by default. BUG=18575 TEST=Run Chrome on Windows without any flags. Enable auto-detect in proxy configuration. Net log should show attempts to auto-detect via DHCP. Review URL: http://codereview.chromium.org/7034035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86422 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/net/connection_tester.cc | 4 ++-- chrome/browser/net/proxy_service_factory.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/browser/net') diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 2cf1e42..4ca5b42 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -187,8 +187,8 @@ class ExperimentURLRequestContext : public net::URLRequestContext { net::DhcpProxyScriptFetcherFactory dhcp_factory; if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableDhcpWpad)) { - dhcp_factory.set_enabled(true); + switches::kDisableDhcpWpad)) { + dhcp_factory.set_enabled(false); } proxy_service->reset(net::ProxyService::CreateUsingV8ProxyResolver( diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc index cf97923..898596eb 100644 --- a/chrome/browser/net/proxy_service_factory.cc +++ b/chrome/browser/net/proxy_service_factory.cc @@ -86,8 +86,8 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService( net::ProxyService* proxy_service; if (use_v8) { net::DhcpProxyScriptFetcherFactory dhcp_factory; - if (command_line.HasSwitch(switches::kEnableDhcpWpad)) { - dhcp_factory.set_enabled(true); + if (command_line.HasSwitch(switches::kDisableDhcpWpad)) { + dhcp_factory.set_enabled(false); } proxy_service = net::ProxyService::CreateUsingV8ProxyResolver( -- cgit v1.1