Revert 89629 - Revert 89486 - Revert 87047 - Revert 86422 - Make DHCP WPAD on by default.

net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc

Index: net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc
===================================================================
--- net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc	(revision 89632)
+++ net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc	(working copy)
@@ -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, 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());