Ship WebBluetooth out of origin trial

content/child/runtime_features.cc

Index: content/child/runtime_features.cc
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index 1cf707331344d6d379e07ed5bb288c204df23b0b..22d31040e38aee135b486e0e9f2e14749f3f63dc 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -53,6 +53,12 @@ static void SetRuntimeFeatureDefaultsForPlatform() {
     // Only Android, ChromeOS support NetInfo right now.
     WebRuntimeFeatures::enableNetworkInformation(false);
 #endif
+
+// Web Bluetooth is shipped on Android, ChromeOS & MacOS, experimental
+// otherwise.
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX)
+  WebRuntimeFeatures::enableWebBluetooth(true);

[ortuno, 2016/10/27 22:58:33]

Now that you are doing this here couldn't you just do:

if (RuntimeEnabledFeatures::webBluetoothEnabled()) {
  BluetoothSupplement::provideTo(frame, client->bluetooth());
}

in
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/web/ChromeClie...

Just a suggestion, no need to delay landing the patch for this.

[juncai, 2016/10/28 02:59:51]

Done.

+#endif
 }
 
 void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
@@ -68,9 +74,6 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
   WebRuntimeFeatures::enableFeaturePolicy(
       base::FeatureList::IsEnabled(features::kFeaturePolicy));
 
-  if (command_line.HasSwitch(switches::kEnableWebBluetooth))
-    WebRuntimeFeatures::enableWebBluetooth(true);
-
   if (!base::FeatureList::IsEnabled(features::kWebUsb))
     WebRuntimeFeatures::enableWebUsb(false);