Enable Device Discovery by default on Linux, ChromeOS and Windows.

chrome/common/chrome_switches.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 538 matching lines @@
 const char kEnableCloudPrintProxy[]         = "enable-cloud-print-proxy";
 
 // Enables fetching and storing cloud policy for components. This currently
 // supports policy for extensions on Chrome OS.
 const char kEnableComponentCloudPolicy[]    = "enable-component-cloud-policy";
 
 // Enables fetching the user's contacts from Google and showing them in the
 // Chrome OS apps list.
 const char kEnableContacts[]                = "enable-contacts";
 
-// Enables device discovery.
-const char kEnableDeviceDiscovery[]        = "enable-device-discovery";
+// Disables device discovery.

[Lei Zhang, 2013/09/06 23:50:01]

nit: keep this in the same order as the header file.

[Vitaly Buka (NO REVIEWS), 2013/09/06 23:53:13]

Done.

+const char kDisableDeviceDiscovery[]        = "disable-device-discovery";
 
 // If true devtools experimental settings are enabled.
 const char kEnableDevToolsExperiments[]     = "enable-devtools-experiments";
 
 // Force-enables DNS probes on main frame DNS errors.  (The user must still
 // opt in to "Use web service to resolve navigation errors".)
 const char kEnableDnsProbes[]               = "enable-dns-probes";
 
 // Enables extensions to be easily installed from sites other than the web
 // store. Without this flag, they can still be installed, but must be manually
@@ skipping 1036 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead, please
 // put them in alphabetical order above, or in order inside the appropriate
 // ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches