diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-20 00:28:21 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-20 00:28:21 +0000 |
| commit | dc9eb03de1299875489c1dd3724d45da42b7bff7 (patch) | |
| tree | 9011eb3dd26b6f5fb0a02474ab3a0e546a1424ea /chrome/browser/net/connection_tester.cc | |
| parent | 69c14c30e724c382358018e511a66641386e90c8 (diff) | |
| download | chromium_src-dc9eb03de1299875489c1dd3724d45da42b7bff7.zip chromium_src-dc9eb03de1299875489c1dd3724d45da42b7bff7.tar.gz chromium_src-dc9eb03de1299875489c1dd3724d45da42b7bff7.tar.bz2 | |
Revert 89629 - Revert 89486 - 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
TBR=joi@chromium.org
NOTE: I'll roll it back in if it turns out this wasn't the problem.
Review URL: http://codereview.chromium.org/7200025
TBR=cevans@chromium.org
Review URL: http://codereview.chromium.org/7204024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/connection_tester.cc')
| -rw-r--r-- | chrome/browser/net/connection_tester.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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( |