Migrate WebUSB WPT to Mojo JS modules

Bug: 1004256
Change-Id: Iaaf8e601a7f3e400bd7aff5b60e8586e7adb43a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2616519Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
Auto-Submit: Ken Rockot <rockot@google.com>
Commit-Queue: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#841569}

chrome/tools/build/linux/FILES.cfg

@@ -443,17 +443,17 @@ FILES = [
   },
   # MojoJS support data (WebUSB):
   {
-    'filename': 'gen/url/mojom/url.mojom.js',
+    'filename': 'gen/url/mojom/url.mojom.m.js',
     'buildtype': ['dev', 'official'],
     'archive': 'mojojs.zip',
   },
   {
-    'filename': 'gen/services/device/public/mojom/usb_*.mojom.js',
+    'filename': 'gen/services/device/public/mojom/usb_*.mojom.m.js',
     'buildtype': ['dev', 'official'],
     'archive': 'mojojs.zip',
   },
   {
-    'filename': 'gen/third_party/blink/public/mojom/usb/web_usb_service.mojom.js',
+    'filename': 'gen/third_party/blink/public/mojom/usb/web_usb_service.mojom.m.js',
     'buildtype': ['dev', 'official'],
     'archive': 'mojojs.zip',
   },

third_party/blink/web_tests/external/wpt/lint.ignore

@@ -723,12 +723,12 @@ MISSING DEPENDENCY: generic-sensor/resources/generic-sensor-helpers.js
 MISSING DEPENDENCY: idle-detection/resources/idle-detection-helper.js
 MISSING DEPENDENCY: mediacapture-image/resources/imagecapture-helpers.js
 MISSING DEPENDENCY: orientation-event/resources/orientation-event-helpers.js
+MISSING DEPENDENCY: resources/chromium/webusb-test.js
 MISSING DEPENDENCY: resources/test-only-api.js
 MISSING DEPENDENCY: screen_enumeration/resources/screenenumeration-helpers.js
 MISSING DEPENDENCY: serial/resources/automation.js
 MISSING DEPENDENCY: shape-detection/resources/shapedetection-helpers.js
 MISSING DEPENDENCY: web-nfc/resources/nfc-helpers.js
-MISSING DEPENDENCY: webusb/resources/usb-helpers.js
 MISSING DEPENDENCY: webxr/resources/webxr_util.js
 
 # Tests that are false positives for using Ahem as a system font

third_party/blink/web_tests/external/wpt/resources/chromium/webusb-test.js

@@ -16,6 +16,19 @@ let internal = {
   messagePort: null,
 };
 
+let mojom = {};
+
+async function loadMojomDefinitions() {
+  const deviceMojom =
+      await import('/gen/services/device/public/mojom/usb_device.mojom.m.js');
+  const serviceMojom = await import(
+      '/gen/third_party/blink/public/mojom/usb/web_usb_service.mojom.m.js');
+  return {
+    ...deviceMojom,
+    ...serviceMojom,
+  };
+}
+
 function getMessagePort(target) {
   return new Promise(resolve => {
     target.addEventListener('message', messageEvent => {
@@ -93,29 +106,29 @@ function fakeDeviceInitToDeviceInfo(guid, init) {
           var endpointInfo = {
             endpointNumber: endpoint.endpointNumber,
             packetSize: endpoint.packetSize,
-            synchronizationType: device.mojom.UsbSynchronizationType.NONE,
-            usageType: device.mojom.UsbUsageType.DATA,
+            synchronizationType: mojom.UsbSynchronizationType.NONE,
+            usageType: mojom.UsbUsageType.DATA,
             pollingInterval: 0,
             extraData: new Uint8Array()
           };
           switch (endpoint.direction) {
-          case "in":
-            endpointInfo.direction = device.mojom.UsbTransferDirection.INBOUND;
-            break;
-          case "out":
-            endpointInfo.direction = device.mojom.UsbTransferDirection.OUTBOUND;
-            break;
+            case "in":
+              endpointInfo.direction = mojom.UsbTransferDirection.INBOUND;
+              break;
+            case "out":
+              endpointInfo.direction = mojom.UsbTransferDirection.OUTBOUND;
+              break;
           }
           switch (endpoint.type) {
-          case "bulk":
-            endpointInfo.type = device.mojom.UsbTransferType.BULK;
-            break;
-          case "interrupt":
-            endpointInfo.type = device.mojom.UsbTransferType.INTERRUPT;
-            break;
-          case "isochronous":
-            endpointInfo.type = device.mojom.UsbTransferType.ISOCHRONOUS;
-            break;
+            case "bulk":
+              endpointInfo.type = mojom.UsbTransferType.BULK;
+              break;
+            case "interrupt":
+              endpointInfo.type = mojom.UsbTransferType.INTERRUPT;
+              break;
+            case "isochronous":
+              endpointInfo.type = mojom.UsbTransferType.ISOCHRONOUS;
+              break;
           }
           alternateInfo.endpoints.push(endpointInfo);
         });
@@ -173,7 +186,7 @@ class FakeDevice {
   open() {
     assert_false(this.opened_);
     this.opened_ = true;
-    return Promise.resolve({ error: device.mojom.UsbOpenDeviceError.OK });
+    return Promise.resolve({error: mojom.UsbOpenDeviceError.OK});
   }
 
   close() {
@@ -244,36 +257,35 @@ class FakeDevice {
   async controlTransferIn(params, length, timeout) {
     assert_true(this.opened_);
 
-    if ((params.recipient == device.mojom.UsbControlTransferRecipient.INTERFACE ||
-         params.recipient == device.mojom.UsbControlTransferRecipient.ENDPOINT) &&
+    if ((params.recipient == mojom.UsbControlTransferRecipient.INTERFACE ||
+         params.recipient == mojom.UsbControlTransferRecipient.ENDPOINT) &&
         this.currentConfiguration_ == null) {
       return {
-        status: device.mojom.UsbTransferStatus.PERMISSION_DENIED,
+        status: mojom.UsbTransferStatus.PERMISSION_DENIED,
       };
     }
 
     return {
-      status: device.mojom.UsbTransferStatus.OK,
-      data: [length >> 8, length & 0xff, params.request, params.value >> 8,
-             params.value & 0xff, params.index >> 8, params.index & 0xff]
+      status: mojom.UsbTransferStatus.OK,
+      data: [
+        length >> 8, length & 0xff, params.request, params.value >> 8,
+        params.value & 0xff, params.index >> 8, params.index & 0xff
+      ]
     };
   }
 
   async controlTransferOut(params, data, timeout) {
     assert_true(this.opened_);
 
-    if ((params.recipient == device.mojom.UsbControlTransferRecipient.INTERFACE ||
-         params.recipient == device.mojom.UsbControlTransferRecipient.ENDPOINT) &&
+    if ((params.recipient == mojom.UsbControlTransferRecipient.INTERFACE ||
+         params.recipient == mojom.UsbControlTransferRecipient.ENDPOINT) &&
         this.currentConfiguration_ == null) {
       return {
-        status: device.mojom.UsbTransferStatus.PERMISSION_DENIED,
+        status: mojom.UsbTransferStatus.PERMISSION_DENIED,
       };
     }
 
-    return {
-      status: device.mojom.UsbTransferStatus.OK,
-      bytesWritten: data.byteLength
-    };
+    return {status: mojom.UsbTransferStatus.OK, bytesWritten: data.byteLength};
   }
 
   genericTransferIn(endpointNumber, length, timeout) {
@@ -283,20 +295,15 @@ class FakeDevice {
     let data = new Array(length);
     for (let i = 0; i < length; ++i)
       data[i] = i & 0xff;
-    return Promise.resolve({
-      status: device.mojom.UsbTransferStatus.OK,
-      data: data
-    });
+    return Promise.resolve({status: mojom.UsbTransferStatus.OK, data: data});
   }
 
   genericTransferOut(endpointNumber, data, timeout) {
     assert_true(this.opened_);
     assert_false(this.currentConfiguration_ == null, 'device configured');
     // TODO(reillyg): Assert that endpoint is valid.
-    return Promise.resolve({
-      status: device.mojom.UsbTransferStatus.OK,
-      bytesWritten: data.byteLength
-    });
+    return Promise.resolve(
+        {status: mojom.UsbTransferStatus.OK, bytesWritten: data.byteLength});
   }
 
   isochronousTransferIn(endpointNumber, packetLengths, timeout) {
@@ -312,7 +319,7 @@ class FakeDevice {
       packets[i] = {
         length: packetLengths[i],
         transferredLength: packetLengths[i],
-        status: device.mojom.UsbTransferStatus.OK
+        status: mojom.UsbTransferStatus.OK
       };
     }
     return Promise.resolve({ data: data, packets: packets });
@@ -327,7 +334,7 @@ class FakeDevice {
       packets[i] = {
         length: packetLengths[i],
         transferredLength: packetLengths[i],
-        status: device.mojom.UsbTransferStatus.OK
+        status: mojom.UsbTransferStatus.OK
       };
     }
     return Promise.resolve({ packets: packets });
@@ -336,7 +343,7 @@ class FakeDevice {
 
 class FakeWebUsbService {
   constructor() {
-    this.bindingSet_ = new mojo.BindingSet(blink.mojom.WebUsbService);
+    this.receiver_ = new mojom.WebUsbServiceReceiver(this);
     this.devices_ = new Map();
     this.devicesByGuid_ = new Map();
     this.client_ = null;
@@ -344,7 +351,7 @@ class FakeWebUsbService {
   }
 
   addBinding(handle) {
-    this.bindingSet_.addBinding(this, handle);
+    this.receiver_.$.bindHandle(handle);
   }
 
   addDevice(fakeDevice, info) {
@@ -352,7 +359,7 @@ class FakeWebUsbService {
       fakeDevice: fakeDevice,
       guid: (this.nextGuid_++).toString(),
       info: info,
-      bindingArray: []
+      receivers: [],
     };
     this.devices_.set(fakeDevice, device);
     this.devicesByGuid_.set(device.guid, device);
@@ -365,8 +372,8 @@ class FakeWebUsbService {
     if (!device)
       throw new Error('Cannot remove unknown device.');
 
-    for (var binding of device.bindingArray)
-      binding.close();
+    for (const receiver of device.receivers)
+      receiver.$.close();
     this.devices_.delete(device.fakeDevice);
     this.devicesByGuid_.delete(device.guid);
     if (this.client_) {
@@ -377,8 +384,8 @@ class FakeWebUsbService {
 
   removeAllDevices() {
     this.devices_.forEach(device => {
-      for (var binding of device.bindingArray)
-        binding.close();
+      for (const receiver of device.receivers)
+        receiver.$.close();
       this.client_.onDeviceRemoved(
           fakeDeviceInitToDeviceInfo(device.guid, device.info));
     });
@@ -397,17 +404,16 @@ class FakeWebUsbService {
   getDevice(guid, request) {
     let retrievedDevice = this.devicesByGuid_.get(guid);
     if (retrievedDevice) {
-      let binding = new mojo.Binding(
-          device.mojom.UsbDevice,
-          new FakeDevice(retrievedDevice.info),
-          request);
-      binding.setConnectionErrorHandler(() => {
+      const receiver =
+          new mojom.UsbDeviceReceiver(new FakeDevice(retrievedDevice.info));
+      receiver.$.bindHandle(request.handle);
+      receiver.onConnectionError.addListener(() => {
         if (retrievedDevice.fakeDevice.onclose)
           retrievedDevice.fakeDevice.onclose();
       });
-      retrievedDevice.bindingArray.push(binding);
+      retrievedDevice.receivers.push(receiver);
     } else {
-      request.close();
+      request.handle.close();
     }
   }
 
@@ -422,8 +428,8 @@ class FakeWebUsbService {
     });
   }
 
-  setClient(clientInfo) {
-    this.client_ = new device.mojom.UsbDeviceManagerClientAssociatedPtr(clientInfo);
+  setClient(client) {
+    this.client_ = client;
   }
 }
 
@@ -474,9 +480,10 @@ class USBTest {
       getMessagePort(window);
     }
 
+    mojom = await loadMojomDefinitions();
     internal.webUsbService = new FakeWebUsbService();
     internal.webUsbServiceInterceptor =
-        new MojoInterfaceInterceptor(blink.mojom.WebUsbService.name);
+        new MojoInterfaceInterceptor(mojom.WebUsbService.$interfaceName);
     internal.webUsbServiceInterceptor.oninterfacerequest =
         e => internal.webUsbService.addBinding(e.handle);
     internal.webUsbServiceInterceptor.start();
@@ -498,7 +505,7 @@ class USBTest {
       return new Promise(resolve => {
         internal.messagePort.onmessage = channelEvent => {
           switch (channelEvent.data.type) {
-            case blink.mojom.WebUsbService.name:
+            case mojom.WebUsbService.$interfaceName:
               internal.webUsbService.addBinding(channelEvent.data.handle);
               break;
             case 'Complete':
@@ -507,10 +514,11 @@ class USBTest {
           }
         };
         internal.messagePort.postMessage({
-          type: 'Attach' ,
+          type: 'Attach',
           interfaces: [
-            blink.mojom.WebUsbService.name,
-          ]});
+            mojom.WebUsbService.$interfaceName,
+          ]
+        });
       });
     });
   }

third_party/blink/web_tests/external/wpt/webusb/resources/usb-helpers.js

@@ -16,28 +16,12 @@
   }
 })();
 
-// This function is shared between blink/web_tests/usb and external/wpt/webusb.
-// Only include "/gen/" paths here, which are available in both places.
-async function loadChromiumResources() {
-  const chromiumResources = [
-    '/gen/mojo/public/mojom/base/big_buffer.mojom.js',
-    '/gen/mojo/public/mojom/base/string16.mojom.js',
-    '/gen/url/mojom/url.mojom.js',
-    '/gen/services/device/public/mojom/usb_device.mojom.js',
-    '/gen/services/device/public/mojom/usb_enumeration_options.mojom.js',
-    '/gen/services/device/public/mojom/usb_manager_client.mojom.js',
-    '/gen/third_party/blink/public/mojom/usb/web_usb_service.mojom.js',
-  ];
-  await loadMojoResources(chromiumResources);
-}
-
 function usb_test(func, name, properties) {
   promise_test(async () => {
     assert_implements(navigator.usb, 'missing navigator.usb');
     if (navigator.usb.test === undefined) {
       // Try loading a polyfill for the WebUSB Testing API.
       if (isChromiumBased) {
-        await loadChromiumResources();
         await loadScript('/resources/chromium/webusb-test.js');
       }
     }