Update webusb test

Upstream re-attempt at https://github.com/web-platform-tests/wpt/pull/9854.
Adds more untested IDL deps.

Change-Id: Icf7bda0f264ec66f4980e0742485eb406e334c19
Reviewed-on: https://chromium-review.googlesource.com/1089862
Commit-Queue: Luke Bj <lukebjerring@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567118}

third_party/WebKit/LayoutTests/external/wpt/interfaces/webusb.idl

-// Copied from https://wicg.github.io/webusb/#idl-index minus the
-// definitions related to Permissions API integration which is unstable.
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the
+// "WebUSB API" spec.
+// See: https://wicg.github.io/webusb/
 
 dictionary USBDeviceFilter {
   unsigned short vendorId;
@@ -14,7 +16,7 @@ dictionary USBDeviceRequestOptions {
   required sequence<USBDeviceFilter> filters;
 };
 
-[Exposed=(DedicatedWorker, SharedWorker, Window), SecureContext]
+[Exposed=(DedicatedWorker,SharedWorker,Window), SecureContext]
 interface USB : EventTarget {
   attribute EventHandler onconnect;
   attribute EventHandler ondisconnect;
@@ -27,7 +29,7 @@ partial interface Navigator {
   [SameObject] readonly attribute USB usb;
 };
 
-[Exposed=(DedicatedWorker, SharedWorker), SecureContext]
+[Exposed=(DedicatedWorker,SharedWorker), SecureContext]
 partial interface WorkerNavigator {
   [SameObject] readonly attribute USB usb;
 };
@@ -38,13 +40,13 @@ dictionary USBConnectionEventInit : EventInit {
 
 [
   Constructor(DOMString type, USBConnectionEventInit eventInitDict),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBConnectionEvent : Event {
   [SameObject] readonly attribute USBDevice device;
 };
 
-[Exposed=(DedicatedWorker, SharedWorker, Window)]
+[Exposed=(DedicatedWorker,SharedWorker,Window)]
 interface USBDevice {
   readonly attribute octet usbVersionMajor;
   readonly attribute octet usbVersionMinor;
@@ -108,7 +110,7 @@ dictionary USBControlTransferParameters {
 
 [
   Constructor(USBTransferStatus status, optional DataView? data),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBInTransferResult {
   readonly attribute DataView? data;
@@ -117,7 +119,7 @@ interface USBInTransferResult {
 
 [
   Constructor(USBTransferStatus status, optional unsigned long bytesWritten = 0),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBOutTransferResult {
   readonly attribute unsigned long bytesWritten;
@@ -126,7 +128,7 @@ interface USBOutTransferResult {
 
 [
   Constructor(USBTransferStatus status, optional DataView? data),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBIsochronousInTransferPacket {
   readonly attribute DataView? data;
@@ -135,7 +137,7 @@ interface USBIsochronousInTransferPacket {
 
 [
   Constructor(sequence<USBIsochronousInTransferPacket> packets, optional DataView? data),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBIsochronousInTransferResult {
   readonly attribute DataView? data;
@@ -144,7 +146,7 @@ interface USBIsochronousInTransferResult {
 
 [
   Constructor(USBTransferStatus status, optional unsigned long bytesWritten = 0),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBIsochronousOutTransferPacket {
   readonly attribute unsigned long bytesWritten;
@@ -153,7 +155,7 @@ interface USBIsochronousOutTransferPacket {
 
 [
   Constructor(sequence<USBIsochronousOutTransferPacket> packets),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBIsochronousOutTransferResult {
   readonly attribute FrozenArray<USBIsochronousOutTransferPacket> packets;
@@ -161,7 +163,7 @@ interface USBIsochronousOutTransferResult {
 
 [
   Constructor(USBDevice device, octet configurationValue),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBConfiguration {
   readonly attribute octet configurationValue;
@@ -171,7 +173,7 @@ interface USBConfiguration {
 
 [
   Constructor(USBConfiguration configuration, octet interfaceNumber),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBInterface {
   readonly attribute octet interfaceNumber;
@@ -182,7 +184,7 @@ interface USBInterface {
 
 [
   Constructor(USBInterface deviceInterface, octet alternateSetting),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBAlternateInterface {
   readonly attribute octet alternateSetting;
@@ -206,7 +208,7 @@ enum USBEndpointType {
 
 [
   Constructor(USBAlternateInterface alternate, octet endpointNumber, USBDirection direction),
-  Exposed=(DedicatedWorker, SharedWorker, Window)
+  Exposed=(DedicatedWorker,SharedWorker,Window)
 ]
 interface USBEndpoint {
   readonly attribute octet endpointNumber;
@@ -214,3 +216,21 @@ interface USBEndpoint {
   readonly attribute USBEndpointType type;
   readonly attribute unsigned long packetSize;
 };
+
+dictionary USBPermissionDescriptor : PermissionDescriptor {
+  sequence<USBDeviceFilter> filters;
+};
+
+dictionary AllowedUSBDevice {
+  required octet vendorId;
+  required octet productId;
+  DOMString serialNumber;
+};
+
+dictionary USBPermissionStorage {
+  sequence<AllowedUSBDevice> allowedDevices = [];
+};
+
+interface USBPermissionResult : PermissionStatus {
+  attribute FrozenArray<USBDevice> devices;
+};

third_party/WebKit/LayoutTests/external/wpt/webusb/idlharness.https-expected.txt

@@ -3,7 +3,7 @@ PASS WebUSB IDL test
 PASS Partial interface Navigator: original interface defined
 PASS Partial interface Navigator: valid exposure set
 PASS Partial interface WorkerNavigator: original interface defined
-FAIL Partial interface WorkerNavigator: valid exposure set Partial WorkerNavigator interface is exposed to 'DedicatedWorker', the original interface is not.
+PASS Partial interface WorkerNavigator: valid exposure set
 PASS USB interface: existence and properties of interface object
 PASS USB interface object length
 PASS USB interface object name
@@ -312,9 +312,17 @@ PASS USBEndpoint interface: usbEndpoint must inherit property "endpointNumber" w
 PASS USBEndpoint interface: usbEndpoint must inherit property "direction" with the proper type
 PASS USBEndpoint interface: usbEndpoint must inherit property "type" with the proper type
 PASS USBEndpoint interface: usbEndpoint must inherit property "packetSize" with the proper type
+FAIL USBPermissionResult interface: existence and properties of interface object assert_own_property: self does not have own property "USBPermissionResult" expected property "USBPermissionResult" missing
+FAIL USBPermissionResult interface object length assert_own_property: self does not have own property "USBPermissionResult" expected property "USBPermissionResult" missing
+FAIL USBPermissionResult interface object name assert_own_property: self does not have own property "USBPermissionResult" expected property "USBPermissionResult" missing
+FAIL USBPermissionResult interface: existence and properties of interface prototype object assert_own_property: self does not have own property "USBPermissionResult" expected property "USBPermissionResult" missing
+FAIL USBPermissionResult interface: existence and properties of interface prototype object's "constructor" property assert_own_property: self does not have own property "USBPermissionResult" expected property "USBPermissionResult" missing
+FAIL USBPermissionResult interface: existence and properties of interface prototype object's @@unscopables property assert_own_property: self does not have own property "USBPermissionResult" expected property "USBPermissionResult" missing
+FAIL USBPermissionResult interface: attribute devices assert_own_property: self does not have own property "USBPermissionResult" expected property "USBPermissionResult" missing
+PASS Unscopable handled correctly for devices property on USBPermissionResult
 PASS Navigator interface: attribute usb
 PASS Unscopable handled correctly for usb property on Navigator
 PASS Navigator interface: navigator must inherit property "usb" with the proper type
-FAIL WorkerNavigator interface: member usb Cannot use 'in' operator to search for 'usb' in undefined
+PASS WorkerNavigator interface: existence and properties of interface object
 Harness: the test ran to completion.
 

third_party/WebKit/LayoutTests/external/wpt/webusb/idlharness.https.html

@@ -24,18 +24,18 @@
       var usbConnectionEvent;
 
       usb_test(async () => {
-        let response = await fetch('/interfaces/webusb.idl');
-        let idl_text = await response.text();
-        let idl_array = new IdlArray();
-        idl_array.add_idls(idl_text);
+        const idl = await fetch('/interfaces/webusb.idl').then(r => r.text());
+        const html = await fetch('/interfaces/html.idl').then(r => r.text());
+        const dom = await fetch('/interfaces/dom.idl').then(r => r.text());
+
+        const idl_array = new IdlArray();
+        idl_array.add_idls(idl);
+        idl_array.add_dependency_idls(html);
+        idl_array.add_dependency_idls(dom);
 
         // Untested IDL interfaces
-        idl_array.add_untested_idls('interface Event {};');
-        idl_array.add_untested_idls('interface EventHandler {};');
-        idl_array.add_untested_idls('dictionary EventInit {};');
-        idl_array.add_untested_idls('interface EventTarget {};');
-        idl_array.add_untested_idls('interface Navigator {};');
-        idl_array.add_untested_idls('interface WorkerNavigator {};');
+        idl_array.add_untested_idls('dictionary PermissionDescriptor {};');
+        idl_array.add_untested_idls('interface PermissionStatus {};');
 
         let {device} = await getFakeDevice();
 

third_party/WebKit/LayoutTests/external/wpt/webusb/resources/idlharness.dedicatedworker.sharedworker.js

@@ -14,19 +14,18 @@ var usbEndpoint;
 var usbConnectionEvent;
 
 usb_test(async () => {
-  let webUSBResponse = await fetch('/interfaces/webusb.idl');
-  let domResponse = await fetch('/interfaces/dom.idl');
-  let webusb_idl_text = await webUSBResponse.text();
-  let dom_idl_text = await domResponse.text();
+  const idl = await fetch('/interfaces/webusb.idl').then(r => r.text());
+  const html = await fetch('/interfaces/html.idl').then(r => r.text());
+  const dom = await fetch('/interfaces/dom.idl').then(r => r.text());
+
   let idl_array = new IdlArray();
-  idl_array.add_idls(webusb_idl_text);
+  idl_array.add_idls(idl);
+  idl_array.add_dependency_idls(html);
+  idl_array.add_dependency_idls(dom);
 
   // Untested IDL interfaces
-  idl_array.add_untested_idls(dom_idl_text, { only: ['Event', 'EventTarget'] });
-  idl_array.add_untested_idls('interface EventHandler {};');
-  idl_array.add_untested_idls('dictionary EventInit {};');
-  idl_array.add_untested_idls('interface Navigator {};');
-  idl_array.add_untested_idls('interface WorkerNavigator {};');
+  idl_array.add_untested_idls('dictionary PermissionDescriptor {};');
+  idl_array.add_untested_idls('interface PermissionStatus {};');
 
   let {device} = await getFakeDevice();
 
@@ -58,4 +57,4 @@ usb_test(async () => {
   idl_array.test();
 }, 'WebUSB on Workers IDL test');
 
-done();
+done();
\ No newline at end of file

third_party/WebKit/LayoutTests/external/wpt/webusb/worker/idlharness.dedicatedworker.https-expected.txt

@@ -3,7 +3,7 @@ PASS WebUSB on Workers IDL test
 PASS Partial interface Navigator: original interface defined
 PASS Partial interface Navigator: valid exposure set
 PASS Partial interface WorkerNavigator: original interface defined
-FAIL Partial interface WorkerNavigator: valid exposure set Partial WorkerNavigator interface is exposed to 'DedicatedWorker', the original interface is not.
+PASS Partial interface WorkerNavigator: valid exposure set
 PASS USB interface: existence and properties of interface object
 PASS USB interface object length
 PASS USB interface object name
@@ -310,9 +310,11 @@ PASS USBEndpoint interface: usbEndpoint must inherit property "endpointNumber" w
 PASS USBEndpoint interface: usbEndpoint must inherit property "direction" with the proper type
 PASS USBEndpoint interface: usbEndpoint must inherit property "type" with the proper type
 PASS USBEndpoint interface: usbEndpoint must inherit property "packetSize" with the proper type
-PASS EventHandler interface: existence and properties of interface object
+PASS USBPermissionResult interface: existence and properties of interface object
 PASS Navigator interface: existence and properties of interface object
-FAIL WorkerNavigator interface: existence and properties of interface object assert_false: expected false got true
+PASS WorkerNavigator interface: attribute usb
+PASS Unscopable handled correctly for usb property on WorkerNavigator
 PASS WorkerNavigator interface: navigator must inherit property "usb" with the proper type
+FAIL PermissionStatus interface: existence and properties of interface object assert_false: expected false got true
 Harness: the test ran to completion.
 

third_party/WebKit/LayoutTests/external/wpt/webusb/worker/idlharness.sharedworker.https-expected.txt

@@ -3,7 +3,7 @@ PASS WebUSB on Workers IDL test
 PASS Partial interface Navigator: original interface defined
 PASS Partial interface Navigator: valid exposure set
 PASS Partial interface WorkerNavigator: original interface defined
-FAIL Partial interface WorkerNavigator: valid exposure set Partial WorkerNavigator interface is exposed to 'DedicatedWorker', the original interface is not.
+PASS Partial interface WorkerNavigator: valid exposure set
 PASS USB interface: existence and properties of interface object
 PASS USB interface object length
 PASS USB interface object name
@@ -310,9 +310,11 @@ PASS USBEndpoint interface: usbEndpoint must inherit property "endpointNumber" w
 PASS USBEndpoint interface: usbEndpoint must inherit property "direction" with the proper type
 PASS USBEndpoint interface: usbEndpoint must inherit property "type" with the proper type
 PASS USBEndpoint interface: usbEndpoint must inherit property "packetSize" with the proper type
-PASS EventHandler interface: existence and properties of interface object
+PASS USBPermissionResult interface: existence and properties of interface object
 PASS Navigator interface: existence and properties of interface object
-FAIL WorkerNavigator interface: existence and properties of interface object assert_false: expected false got true
+PASS WorkerNavigator interface: attribute usb
+PASS Unscopable handled correctly for usb property on WorkerNavigator
 PASS WorkerNavigator interface: navigator must inherit property "usb" with the proper type
+FAIL PermissionStatus interface: existence and properties of interface object assert_false: expected false got true
 Harness: the test ran to completion.