Enable Device Discovery by default on Linux, ChromeOS and Windows.
Replace --enable-device-discovery flags with --disable-device-discovery.

BUG=286157

Review URL: https://chromiumcodereview.appspot.com/23567023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221960 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 9fd6c48..c26ac28 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1468,11 +1468,11 @@
     SINGLE_VALUE_TYPE(switches::kSyncfsEnableDirectoryOperation),
   },
   {
-    "enable-device-discovery",
-    IDS_FLAGS_ENABLE_DEVICE_DISCOVERY_NAME,
-    IDS_FLAGS_ENABLE_DEVICE_DISCOVERY_DESCRIPTION,
-    kOsDesktop,
-    SINGLE_VALUE_TYPE(switches::kEnableDeviceDiscovery)
+    "disable-device-discovery",
+    IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_NAME,
+    IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_DESCRIPTION,
+    kOsWin | kOsLinux | kOsCrOS,
+    SINGLE_VALUE_TYPE(switches::kDisableDeviceDiscovery)
   },
 #if defined(OS_MACOSX)
   {
@@ -1549,8 +1549,8 @@
     IDS_FLAGS_HIDPI_NAME,
     IDS_FLAGS_HIDPI_DESCRIPTION,
     kOsWin,
-    ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kHighDPISupport,"1",
-        switches::kHighDPISupport,"0")
+    ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kHighDPISupport, "1",
+                                        switches::kHighDPISupport, "0")
   },
 #if defined(OS_CHROMEOS)
   {