bluetooth: Enable Web Bluetooth on experimental framework

third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp

 // Copyright 2015 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 "modules/bluetooth/Bluetooth.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
@@ skipping 111 matching lines @@
                 return;
             optionalServices.append(validatedOptionalService);
         }
         result.optionalServices.assign(optionalServices);
     }
 }
 
 // https://webbluetoothchrome.github.io/web-bluetooth/#dom-bluetooth-requestdevice
 ScriptPromise Bluetooth::requestDevice(ScriptState* scriptState, const RequestDeviceOptions& options, ExceptionState& exceptionState)
 {
-    // TODO(https://crbug.com/584113) Enable Web Bluetooth Experiment.
-    // Restore this logic when re-enabling the experiment:
-    //
     // By adding the "OriginTrialEnabled" extended binding, we enable the
     // requestDevice function on all platforms for whitelisted domains. Since we
     // only support Chrome OS and Android for this experiment we reject any
     // promises from other platforms unless they have the enable-web-bluetooth
     // flag on.
-#if 0 // !OS(CHROMEOS) && !OS(ANDROID)
+#if !OS(CHROMEOS) && !OS(ANDROID)
     if (!RuntimeEnabledFeatures::webBluetoothEnabled()) {
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError, "Web Bluetooth is not enabled on this platform. To find out how to enable it and the current implementation status visit https://goo.gl/HKa2If"));
     }
 #endif
 
     // 1. If the incumbent settings object is not a secure context, reject promise with a SecurityError and abort these steps.
     String errorMessage;
     if (!scriptState->getExecutionContext()->isSecureContext(errorMessage)) {
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SecurityError, errorMessage));
     }
@@ skipping 15 matching lines @@
 
     // Subsequent steps are handled in the browser process.
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     webbluetooth->requestDevice(webOptions, new CallbackPromiseAdapter<BluetoothDevice, BluetoothError>(resolver));
     return promise;
 
 }
 
 } // namespace blink