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

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc	(revision 89628)
+++ chrome/common/chrome_switches.cc	(working copy)
@@ -202,9 +202,6 @@
 // Disables the custom JumpList on Windows 7.
 const char kDisableCustomJumpList[]         = "disable-custom-jumplist";
 
-// 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";
 
@@ -380,6 +377,11 @@
 // 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[] =