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
diff --git a/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc b/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc
index 902a41b2d02fc0c268ae232a1374decd11d0e455..97730bc044f7c09cdaca439be56a2077c214928a 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());