Revert 86422 - Make DHCP WPAD on by default.

Reason: Turning off for M13 branch based on some concerns from user experience metrics. Will re-enable after M13 branch point.

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/7082004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87047 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 9 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 e28cc19..902a41b 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc
+++ b/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc
@@ -5,14 +5,12 @@
 #include "net/proxy/dhcp_proxy_script_fetcher.h"
 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
-#include "testing/gtest/include/gtest/gtest.h"

+#include "testing/gtest/include/gtest/gtest.h"
 
 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());