diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 18:14:00 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 18:14:00 +0000 |
| commit | 89b9b7bb6af6f8503f59a47878aa9034f5cf88a3 (patch) | |
| tree | 376faec5fed1c3cdd7eb1e1fe79f029825e2bf8d /chrome/browser/net/proxy_service_factory.cc | |
| parent | eac025f0b0ee044453513b89cf6c960b7cf62ce3 (diff) | |
| download | chromium_src-89b9b7bb6af6f8503f59a47878aa9034f5cf88a3.zip chromium_src-89b9b7bb6af6f8503f59a47878aa9034f5cf88a3.tar.gz chromium_src-89b9b7bb6af6f8503f59a47878aa9034f5cf88a3.tar.bz2 | |
Revert 86422 - Make DHCP WPAD on by default.
Reason: Turning off for M13 branch based on some concerns from user experience metrics. Will re-enable after M13 branch point.
BUG=18575,84047
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/7082004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/proxy_service_factory.cc')
| -rw-r--r-- | chrome/browser/net/proxy_service_factory.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc index 898596eb..cf97923 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::kDisableDhcpWpad)) { - dhcp_factory.set_enabled(false); + if (command_line.HasSwitch(switches::kEnableDhcpWpad)) { + dhcp_factory.set_enabled(true); } proxy_service = net::ProxyService::CreateUsingV8ProxyResolver( |