diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 15:30:58 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 15:30:58 +0000 |
| commit | 882de97f03f969ec62682d534bbe868b83d4aa6f (patch) | |
| tree | 3abc16760743be2799318b386e2d473caaa30257 /chrome/browser/net/proxy_service_factory.cc | |
| parent | 7781b6ea007566b9cd027b46b7d63b89176e223b (diff) | |
| download | chromium_src-882de97f03f969ec62682d534bbe868b83d4aa6f.zip chromium_src-882de97f03f969ec62682d534bbe868b83d4aa6f.tar.gz chromium_src-882de97f03f969ec62682d534bbe868b83d4aa6f.tar.bz2 | |
Revert 87047 - Revert 86422 - Make DHCP WPAD on by default.
Reason: Turning back on for trunk to collect data as performance worries are addressed.
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/7167016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89486 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 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( |