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 /net/proxy/dhcp_proxy_script_fetcher_factory_unittest.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 'net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc')
| -rw-r--r-- | net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc b/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc index 902a41b..97730bc 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc +++ b/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc @@ -9,8 +9,10 @@ namespace net { namespace { + TEST(DhcpProxyScriptFetcherFactoryTest, DoNothingWhenDisabled) { DhcpProxyScriptFetcherFactory factory; + factory.set_enabled(false); scoped_ptr<DhcpProxyScriptFetcher> fetcher(factory.Create(NULL)); EXPECT_EQ("", fetcher->GetFetcherName()); } @@ -36,7 +38,11 @@ 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()); |