Ship WebBluetooth out of origin trial

content/child/runtime_features.cc

 // Copyright 2013 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 "content/child/runtime_features.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 50 matching lines @@
       switches::kEnableExperimentalWebPlatformFeatures);
   if (enableExperimentalWebPlatformFeatures)
     WebRuntimeFeatures::enableExperimentalFeatures(true);
 
   WebRuntimeFeatures::enableOriginTrials(
       base::FeatureList::IsEnabled(features::kOriginTrials));
 
   WebRuntimeFeatures::enableFeaturePolicy(
       base::FeatureList::IsEnabled(features::kFeaturePolicy));
 
-  if (command_line.HasSwitch(switches::kEnableWebBluetooth))
-    WebRuntimeFeatures::enableWebBluetooth(true);
+  // Web Bluetooth is shipped on Android, ChromeOS & MacOS, experimental
+  // otherwise.
+  bool enable_web_bluetooth = enableExperimentalWebPlatformFeatures;
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX)

[Rick Byers, 2016/10/27 20:37:54]

please move this into SetRuntimeFeatureDefaultsForPlatform along with all the
other per-platform feature settings.  Note that there's no need to rely on the
enableExperimentalWebPlatformFeatures (that's handled above) - just do:
#if defined(OS_CHROMEOS) || ...
  WebRuntimeFeatures::enabledWebBluetooth(true);
#endif

[juncai, 2016/10/27 21:54:26]

Done.

+  enable_web_bluetooth = true;
+#endif
+  WebRuntimeFeatures::enableWebBluetooth(enable_web_bluetooth);
 
   if (!base::FeatureList::IsEnabled(features::kWebUsb))
     WebRuntimeFeatures::enableWebUsb(false);
 
   SetRuntimeFeatureDefaultsForPlatform();
 
   if (command_line.HasSwitch(switches::kDisableDatabases))
     WebRuntimeFeatures::enableDatabase(false);
 
   if (command_line.HasSwitch(switches::kDisableNotifications)) {
@@ skipping 242 matching lines @@
   if (command_line.HasSwitch(switches::kDisableBlinkFeatures)) {
     std::vector<std::string> disabled_features = base::SplitString(
         command_line.GetSwitchValueASCII(switches::kDisableBlinkFeatures),
         ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     for (const std::string& feature : disabled_features)
       WebRuntimeFeatures::enableFeatureFromString(feature, false);
   }
 }
 
 }  // namespace content