[WPT] Refactor WebBluetooth tests to use test-only-api.js

And remove unused mojom.js files.

Bug: 1094512
Change-Id: Ibe8503d72fff30b96248c14647b65481c06c7b2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2350482
Commit-Queue: Robert Ma <[email protected]>
Reviewed-by: Reilly Grant <[email protected]>
Auto-Submit: Robert Ma <[email protected]>
Cr-Commit-Position: refs/heads/master@{#798691}

Author: Hexcles

bluetooth/resources/bluetooth-test.js

@@ -18,19 +18,6 @@ function loadScript(path) {
   return promise;
 }
 
-/**
- * Loads the scripts in |paths|.
- * @param {string[]} paths
- * @returns {Promise<void>} A promise chain that resolves when all scripts have
- *     finished loading.
- */
-async function loadScripts(paths) {
-  for (let path of paths) {
-    await loadScript(path);
-  }
-  return;
-}
-
 /**
  * Performs the Chromium specific setup necessary to run the tests in the
  * Chromium browser. This test file is shared between Web Platform Tests and
@@ -42,36 +29,30 @@ async function loadScripts(paths) {
  * @returns {Promise<void>} Resolves when Chromium specific setup is complete.
  */
 async function performChromiumSetup() {
-  // Make sure we are actually on Chromium with Mojo enabled.
-  if (typeof Mojo === 'undefined') {
-    return;
-  }
-
-  // Load the Chromium-specific resources.
-  let prefix = '/resources/chromium';
-  let genPrefix = '/gen';
-  let extra = [];
+  // Determine path prefixes.
+  let resPrefix = '/resources';
+  let extra = ['/resources/chromium/web-bluetooth-test.js'];
   const pathname = window.location.pathname;
-  if (pathname.includes('/LayoutTests/') || pathname.includes('/web_tests/')) {
-    let root = pathname.match(/.*(?:LayoutTests|web_tests)/);
-    prefix = `${root}/external/wpt/resources/chromium`;
+  if (pathname.includes('/web_tests/')) {
+    let root = pathname.match(/.*(?:web_tests)/);
+    resPrefix = `${root}/external/wpt/resources`;
     extra = [
+      `${root}/external/wpt/resources/chromium/web-bluetooth-test.js`,
       `${root}/resources/bluetooth/bluetooth-fake-adapter.js`,
     ];
-    genPrefix = 'file:///gen';
-  } else if (window.location.pathname.startsWith('/bluetooth/https/')) {
-    extra = [
-      '/js-test-resources/bluetooth/bluetooth-fake-adapter.js',
-    ];
   }
-  await loadScripts([
-    `${genPrefix}/layout_test_data/mojo/public/js/mojo_bindings.js`,
-    `${genPrefix}/content/test/data/mojo_web_test_helper_test.mojom.js`,
-    `${genPrefix}/device/bluetooth/public/mojom/uuid.mojom.js`,
-    `${genPrefix}/url/mojom/origin.mojom.js`,
-    `${genPrefix}/device/bluetooth/public/mojom/test/fake_bluetooth.mojom.js`,
-    `${genPrefix}/content/shell/common/web_test/fake_bluetooth_chooser.mojom.js`,
-    `${prefix}/web-bluetooth-test.js`,
+
+  await loadScript(`${resPrefix}/test-only-api.js`);
+  if (!isChromiumBased) {
+    return;
+  }
+
+  await loadMojoResources([
+    '/gen/content/test/data/mojo_web_test_helper_test.mojom.js',
+    '/gen/device/bluetooth/public/mojom/uuid.mojom.js',
+    '/gen/url/mojom/origin.mojom.js',
+    '/gen/device/bluetooth/public/mojom/test/fake_bluetooth.mojom.js',
+    '/gen/content/shell/common/web_test/fake_bluetooth_chooser.mojom.js',
   ].concat(extra));
 
   // Call setBluetoothFakeAdapter() to clean up any fake adapters left over by
@@ -98,8 +79,10 @@ async function performChromiumSetup() {
  */
 function bluetooth_test(test_function, name, properties) {
   return promise_test(async (t) => {
+    assert_implements(navigator.bluetooth, 'missing navigator.bluetooth');
     // Trigger Chromium-specific setup.
     await performChromiumSetup();
+    assert_implements(navigator.bluetooth.test, 'missing navigator.bluetooth.test');
     await test_function(t);
     let consumed = await navigator.bluetooth.test.allResponsesConsumed();
     assert_true(consumed);

lint.ignore

@@ -714,12 +714,13 @@ WEB-PLATFORM.TEST:web-bundle/subresource-loading/subresource-loading-from-web-bu
 # Tests that depend on resources in /gen/ in Chromium:
 # https://github.com/web-platform-tests/wpt/issues/16455
 # Please consult with [email protected] before adding more.
-MISSING DEPENDENCY: resources/test-only-api.js
+MISSING DEPENDENCY: bluetooth/resources/bluetooth-test.js
 MISSING DEPENDENCY: contacts/resources/helpers.js
 MISSING DEPENDENCY: credential-management/support/otpcredential-helper.js
 MISSING DEPENDENCY: generic-sensor/resources/generic-sensor-helpers.js
 MISSING DEPENDENCY: idle-detection/interceptor.https.html
 MISSING DEPENDENCY: orientation-event/resources/orientation-event-helpers.js
+MISSING DEPENDENCY: resources/test-only-api.js
 MISSING DEPENDENCY: screen_enumeration/resources/screenenumeration-helpers.js
 MISSING DEPENDENCY: shape-detection/resources/shapedetection-helpers.js
 MISSING DEPENDENCY: web-nfc/resources/nfc-helpers.js
@@ -729,7 +730,6 @@ MISSING DEPENDENCY: webxr/resources/webxr_util.js
 # TODO(Hexcles): delete these files once we include them in mojojs.zip.
 MOJOM-JS: resources/chromium/image_capture.mojom.js
 MOJOM-JS: resources/chromium/sensor_provider.mojom.js
-MOJOM-JS: resources/chromium/mojo_web_test_helper_test.mojom.js
 MOJOM-JS: resources/chromium/sensor.mojom.js
 
 # Tests that are false positives for using Ahem as a system font