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

4 files changed, 10 insertions, 8 deletions

diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index 4ca5b42..2cf1e42 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -187,8 +187,8 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
 
     net::DhcpProxyScriptFetcherFactory dhcp_factory;
     if (CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kDisableDhcpWpad)) {
-      dhcp_factory.set_enabled(false);
+        switches::kEnableDhcpWpad)) {
+      dhcp_factory.set_enabled(true);
     }
 
     proxy_service->reset(net::ProxyService::CreateUsingV8ProxyResolver(
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index 898596eb..cf97923 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -86,8 +86,8 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
   net::ProxyService* proxy_service;
   if (use_v8) {
     net::DhcpProxyScriptFetcherFactory dhcp_factory;
-    if (command_line.HasSwitch(switches::kDisableDhcpWpad)) {
-      dhcp_factory.set_enabled(false);
+    if (command_line.HasSwitch(switches::kEnableDhcpWpad)) {
+      dhcp_factory.set_enabled(true);
     }
 
     proxy_service = net::ProxyService::CreateUsingV8ProxyResolver(
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 16765cd..5864d8b 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -217,9 +217,6 @@ const char kDisableCustomJumpList[]         = "disable-custom-jumplist";
 // Browser flag to disable the web inspector for all renderers.
 const char kDisableDevTools[]               = "disable-dev-tools";
 
-// Disables retrieval of PAC URLs from DHCP as per the WPAD standard.
-const char kDisableDhcpWpad[]               = "disable-dhcp-wpad";
-
 // Disable extensions.
 const char kDisableExtensions[]             = "disable-extensions";
 
@@ -413,6 +410,11 @@ const char kEnableConnectBackupJobs[]       = "enable-connect-backup-jobs";
 // Enables web developers to create apps for Chrome without using crx packages.
 const char kEnableCrxlessWebApps[]          = "enable-crxless-web-apps";
 
+// Enables retrieval of PAC URLs from DHCP as per the WPAD standard. Note
+// that this feature is not supported on all platforms, and using the flag
+// is a no-op on such platforms.
+const char kEnableDhcpWpad[]                = "enable-dhcp-wpad";
+
 // Enable DNS side checking of certificates. Still experimental, should only
 // be used by developers at the current time.
 const char kEnableDNSCertProvenanceChecking[] =
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 9d51607..634f8b6 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -73,7 +73,6 @@ extern const char kDisableClientSidePhishingDetection[];
 extern const char kDisableConnectBackupJobs[];
 extern const char kDisableCustomJumpList[];
 extern const char kDisableDevTools[];
-extern const char kDisableDhcpWpad[];
 extern const char kDisableExtensionsFileAccessCheck[];
 extern const char kDisableExtensions[];
 extern const char kDisableFlashSandbox[];
@@ -125,6 +124,7 @@ extern const char kEnableCompactNavigation[];
 extern const char kEnableCompositeToTexture[];
 extern const char kEnableConnectBackupJobs[];
 extern const char kEnableCrxlessWebApps[];
+extern const char kEnableDhcpWpad[];
 extern const char kEnableDNSCertProvenanceChecking[];
 extern const char kEnableDNSSECCerts[];
 extern const char kEnableExperimentalAppManifests[];