diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-19 22:37:01 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-19 22:37:01 +0000 |
| commit | 3195daf7a3a188238f0f42272ca909c36707459a (patch) | |
| tree | 2cddea3e993e646fe4475ed4ce08c8c07878215e /net/proxy | |
| parent | af72fdcb104ef51e9beb0e82db009dc8280e9a99 (diff) | |
| download | chromium_src-3195daf7a3a188238f0f42272ca909c36707459a.zip chromium_src-3195daf7a3a188238f0f42272ca909c36707459a.tar.gz chromium_src-3195daf7a3a188238f0f42272ca909c36707459a.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/dhcp_proxy_script_fetcher_factory.cc | 4 | ||||
| -rw-r--r-- | net/proxy/dhcp_proxy_script_fetcher_factory.h | 2 | ||||
| -rw-r--r-- | net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/net/proxy/dhcp_proxy_script_fetcher_factory.cc b/net/proxy/dhcp_proxy_script_fetcher_factory.cc index 01ede05..faedf86 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_factory.cc +++ b/net/proxy/dhcp_proxy_script_fetcher_factory.cc @@ -15,7 +15,9 @@ namespace net { DhcpProxyScriptFetcherFactory::DhcpProxyScriptFetcherFactory() : feature_enabled_(false) { - set_enabled(true); + // TODO(joi): Change this default, and the comment on |set_enabled()|, + // when the time is right. + set_enabled(false); } DhcpProxyScriptFetcher* DhcpProxyScriptFetcherFactory::Create( diff --git a/net/proxy/dhcp_proxy_script_fetcher_factory.h b/net/proxy/dhcp_proxy_script_fetcher_factory.h index 273f321..02f1dcd 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_factory.h +++ b/net/proxy/dhcp_proxy_script_fetcher_factory.h @@ -47,7 +47,7 @@ class NET_API DhcpProxyScriptFetcherFactory { // Attempts to enable/disable the DHCP WPAD feature. Does nothing // if |IsSupported()| returns false. // - // The default is |enabled() == true|. + // The current default is |enabled() == false|. void set_enabled(bool enabled); // Returns true if the DHCP WPAD feature is enabled. Always returns diff --git a/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc b/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc index 97730bc..902a41b 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc +++ b/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc @@ -9,10 +9,8 @@ namespace net { namespace { - TEST(DhcpProxyScriptFetcherFactoryTest, DoNothingWhenDisabled) { DhcpProxyScriptFetcherFactory factory; - factory.set_enabled(false); scoped_ptr<DhcpProxyScriptFetcher> fetcher(factory.Create(NULL)); EXPECT_EQ("", fetcher->GetFetcherName()); } @@ -38,11 +36,7 @@ TEST(DhcpProxyScriptFetcherFactoryTest, IsSupported) { TEST(DhcpProxyScriptFetcherFactoryTest, SetEnabled) { DhcpProxyScriptFetcherFactory factory; -#if defined(OS_WIN) - EXPECT_TRUE(factory.enabled()); -#else EXPECT_FALSE(factory.enabled()); -#endif // defined(OS_WIN) factory.set_enabled(false); EXPECT_FALSE(factory.enabled()); |