Revert "bluetooth: Use new mojo bindings in LayoutTests"

This reverts commit 6aad68e.

Reason for revert: suspected to break bluetooth/requestDevice/canonicalizeFilter/no-arguments.html on Android, see https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Android%20%28Nexus4%29?numbuilds=200

Original change's description:
> bluetooth: Use new mojo bindings in LayoutTests
> 
> This change updates our mojo bindings in javascript to use the new
> `mojo_bindings.js` library.  This is important for our migration to Web
> Platform Tests, because we don't intend to use `mojo-helpers.js` in
> wpt/.
> 
> BUG=509038,699569
> 
> Change-Id: I1309f57a9811802d36649daca4c780e21c3d0d0d
> Reviewed-on: https://chromium-review.googlesource.com/690603
> Commit-Queue: Conley Owens <cco3@chromium.org>
> Reviewed-by: Vincent Scheib <scheib@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#507216}

TBR=dcheng@chromium.org,scheib@chromium.org,cco3@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 509038, 699569
Change-Id: I4ff5a248d1b59c320d01c9a082b226a702dd8ae5
Reviewed-on: https://chromium-review.googlesource.com/707114
Reviewed-by: Henrik Grunell <grunell@chromium.org>
Commit-Queue: Henrik Grunell <grunell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#507373}

device/bluetooth/public/interfaces/BUILD.gn

@@ -10,7 +10,7 @@ mojom("interfaces") {
   ]
 
   # TODO(crbug.com/699569): Convert to use the new JS bindings.
-  js_bindings_mode = "both"
+  use_new_js_bindings = false
 }
 
 mojom("fake_bluetooth_interfaces") {
@@ -23,6 +23,9 @@ mojom("fake_bluetooth_interfaces") {
   ]
 
   use_once_callback = true
+
+  # TODO(crbug.com/699569): Convert to use the new JS bindings.
+  use_new_js_bindings = false
 }
 
 mojom("experimental_interfaces") {

third_party/WebKit/LayoutTests/bluetooth/characteristic/getDescriptor/descriptor-not-found.html

@@ -5,7 +5,7 @@
 <script>
 'use strict';
  let descriptorUUID = '00002906-0000-1000-8000-00805f9b34fb';
-bluetooth_test(() => {
+promise_test(() => {
    return setBluetoothFakeAdapter('DisconnectingHealthThermometerAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['health_thermometer']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/getDescriptors/blocklisted-descriptors-not-present.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   // DisconnectingHealthThermometerAdapter's measurement_interval contains
   // one blocklisted descriptor.  Make sure that it isn't returned in the result
   // of getDescriptors().

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/add-listener-after-promise.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/add-multiple-event-listeners.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   let char;
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/characteristic-does-not-support-notifications.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/characteristic-is-removed.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/concurrent-starts-and-receive-notification.html

@@ -5,7 +5,7 @@
 <script>
 'use strict';
 let char;
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/concurrent-starts.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/concurrent-stops.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/device-goes-out-of-range.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/event-after-starting.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/gc-with-pending-start.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   let start_promise;
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/gc-with-pending-stop.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   let stop_promise;
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/notification-after-disconnection.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   // The iframe we create will subscribe to notifications and will ensure
   // that the browser keeps receiving notifications even after this frame's
   // device disconnects.

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/parallel-start-stop.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/service-is-removed.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/start-before-stop-resolves.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/start-fails.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('FailingGATTOperationsAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: [errorUUID(0xA0)]}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/start-stop-start-stop.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/start-succeeds.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/start-twice-in-a-row.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/stop-after-start-succeeds.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/stop-twice.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/notifications/stop-without-starting.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/readValue/add-multiple-event-listeners.html

@@ -2,9 +2,11 @@
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
+<script src="../../../resources/bluetooth/web-bluetooth-test.js"></script>
+<script src="../../../resources/mojo-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return getMeasurementIntervalCharacteristic()
     .then(({characteristic, fake_characteristic}) => {
       return fake_characteristic.setNextReadResponse(GATT_SUCCESS, [0,1,2])

third_party/WebKit/LayoutTests/bluetooth/characteristic/readValue/blocklisted-characteristic.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('BlocklistTestAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: [blocklist_test_service_uuid]}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/readValue/characteristic-is-removed.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}],

third_party/WebKit/LayoutTests/bluetooth/characteristic/readValue/device-goes-out-of-range.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}],

third_party/WebKit/LayoutTests/bluetooth/characteristic/readValue/event-is-fired.html

@@ -2,9 +2,11 @@
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
+<script src="../../../resources/bluetooth/web-bluetooth-test.js"></script>
+<script src="../../../resources/mojo-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return getMeasurementIntervalCharacteristic()
     .then(({characteristic, fake_characteristic}) => {
       return fake_characteristic.setNextReadResponse(GATT_SUCCESS, [0, 1, 2])

third_party/WebKit/LayoutTests/bluetooth/characteristic/readValue/read-fails.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('FailingGATTOperationsAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: [errorUUID(0xA0)]}]}))

third_party/WebKit/LayoutTests/bluetooth/characteristic/readValue/read-succeeds.html

@@ -2,9 +2,11 @@
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
+<script src="../../../resources/bluetooth/web-bluetooth-test.js"></script>
+<script src="../../../resources/mojo-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   const EXPECTED_VALUE = [0, 1, 2];
   return getMeasurementIntervalCharacteristic()
     .then(({characteristic, fake_characteristic}) => {

third_party/WebKit/LayoutTests/bluetooth/characteristic/readValue/read-updates-value.html

@@ -2,9 +2,11 @@
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
+<script src="../../../resources/bluetooth/web-bluetooth-test.js"></script>
+<script src="../../../resources/mojo-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   const EXPECTED_VALUE = [0, 1, 2];
   return getMeasurementIntervalCharacteristic()
     .then(({characteristic, fake_characteristic}) => {

third_party/WebKit/LayoutTests/bluetooth/characteristic/readValue/service-is-removed.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}],

third_party/WebKit/LayoutTests/bluetooth/characteristic/stopNotifications/device-reconnects-during-success.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
-bluetooth_test(() => {
+promise_test(() => {
   let val = new Uint8Array([1]);
   return setBluetoothFakeAdapter('DisconnectingDuringStopNotifySessionAdapter')
     .then(() => requestDeviceWithKeyDown({

third_party/WebKit/LayoutTests/bluetooth/characteristic/stopNotifications/reconnect-during-success.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
-bluetooth_test(() => {
+promise_test(() => {
   let val = new Uint8Array([1]);
   return setBluetoothFakeAdapter('StopNotifySessionFinishesAfterReconnectionAdapter')
     .then(() => requestDeviceWithKeyDown({

third_party/WebKit/LayoutTests/bluetooth/characteristic/writeValue/blocklisted-characteristic.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('BlocklistTestAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: [blocklist_test_service_uuid]}],

third_party/WebKit/LayoutTests/bluetooth/characteristic/writeValue/characteristic-is-removed.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}],

third_party/WebKit/LayoutTests/bluetooth/characteristic/writeValue/device-goes-out-of-range.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}],

third_party/WebKit/LayoutTests/bluetooth/characteristic/writeValue/service-is-removed.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}],

third_party/WebKit/LayoutTests/bluetooth/characteristic/writeValue/value-too-long.html

@@ -4,7 +4,7 @@
 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
+promise_test(() => {
   return setBluetoothFakeAdapter('HeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}],