Migrate WebUSB LayoutTests into external/wpt

This test moves all the tests from third_party/WebKit/LayoutTests/usb
to third_party/WebKit/LayoutTests/external/wpt/webusb. The WebUSB Test
API polyfill is included in a new resources/chromium directory and
loaded automatically when the tests are run in a Chromium-based browser
with the --enable-blink-features=MojoJS,MojoJSTest flag set.

BUG=705734

Review-Url: https://codereview.chromium.org/2789723003
Cr-Commit-Position: refs/heads/master@{#481732}

third_party/WebKit/LayoutTests/FlagExpectations/enable-network-service

@@ -1524,11 +1524,15 @@ Bug(none) external/wpt/webmessaging/broadcastchannel/blobs.html [ Failure Timeou
 Bug(none) external/wpt/websockets/Secure-Send-binary-blob.htm [ Failure Timeout ]
 Bug(none) external/wpt/websockets/Send-binary-blob.htm [ Failure Timeout ]
 Bug(none) external/wpt/webusb/idlharness.https.html [ Failure Timeout ]
+Bug(none) external/wpt/webusb/usbConnectionEvent.https.html [ Timeout ]
 Bug(none) external/wpt/webusb/usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html [ Timeout ]
 Bug(none) external/wpt/webusb/usb-allowed-by-feature-policy-attribute.https.sub.html [ Failure Timeout ]
 Bug(none) external/wpt/webusb/usb-allowed-by-feature-policy.https.sub.html [ Failure Timeout ]
 Bug(none) external/wpt/webusb/usb-default-feature-policy.https.sub.html [ Failure Timeout ]
 Bug(none) external/wpt/webusb/usb-disabled-by-feature-policy.https.sub.html [ Failure Timeout ]
+Bug(none) external/wpt/webusb/usb-manual.https.html [ Timeout ]
+Bug(none) external/wpt/webusb/usbDevice-iframe.https.html [ Timeout ]
+Bug(none) external/wpt/webusb/usbDevice.https.html [ Timeout ]
 Bug(none) external/wpt/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future.html [ Failure Timeout ]
 Bug(none) external/wpt/workers/SharedWorker_blobUrl.html [ Failure Timeout ]
 Bug(none) external/wpt/workers/constructors/Worker/Blob-url.html [ Failure Timeout ]
@@ -3245,11 +3249,6 @@ Bug(none) tables/mozilla/core/col_widths_fix_autoFixPer.html [ Timeout ]
 Bug(none) tables/mozilla_expected_failures/marvin/backgr_fixed-bg.html [ Failure ]
 Bug(none) traversal/node-iterator-009.html [ Failure ]
 Bug(none) traversal/tree-walker-006.html [ Failure ]
-Bug(none) usb/test-polyfil.html [ Timeout ]
-Bug(none) usb/usb-connection-event.html [ Timeout ]
-Bug(none) usb/usb.html [ Timeout ]
-Bug(none) usb/usbDevice-iframe.html [ Timeout ]
-Bug(none) usb/usbDevice.html [ Timeout ]
 Bug(none) vibration/vibration-iframe.html [ Timeout ]
 Bug(none) vibration/vibration.html [ Timeout ]
 Bug(none) virtual [ Crash Failure Timeout ]

third_party/WebKit/LayoutTests/FlagExpectations/enable-slimming-paint-v2

@@ -63,7 +63,6 @@ Bug(none) touchadjustment/ [ Skip ]
 Bug(none) transforms/ [ Skip ]
 Bug(none) traversal/ [ Skip ]
 Bug(none) typedcssom/ [ Skip ]
-Bug(none) usb/ [ Skip ]
 Bug(none) vibration/ [ Skip ]
 Bug(none) wake_lock/ [ Skip ]
 Bug(none) webaudio/ [ Skip ]

third_party/WebKit/LayoutTests/SlowTests

@@ -345,7 +345,7 @@ crbug.com/697735 external/wpt/editing/run/unlink.html [ Slow ]
 crbug.com/584807 printing/webgl-oversized-printing.html [ Slow ]
 crbug.com/584807 virtual/threaded/printing/webgl-oversized-printing.html [ Slow ]
 
-crbug.com/592183 usb/usbDevice.html [ Slow ]
+crbug.com/592183 external/wpt/webusb/usbDevice.https.html [ Slow ]
 
 crbug.com/594189 virtual/spv2/fast/overflow/lots-of-sibling-inline-boxes.html [ Slow ]
 

third_party/WebKit/LayoutTests/external/wpt/resources/chromium/README.md

+This directory contains Chromium-specific test resources.
+
+The files `mojo_bindings.js` and `*.mojom.js` are automatically generated by the
+Chromium build process and should not be edited manually.

third_party/WebKit/LayoutTests/external/wpt/webusb/OWNERS

-# TEAM: device-dev@chromium.org
 # COMPONENT: Blink>USB
+# TEAM: device-dev@chromium.org

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

@@ -8,14 +8,24 @@
     <script src=/resources/testharnessreport.js></script>
     <script src=/resources/WebIDLParser.js></script>
     <script src=/resources/idlharness.js></script>
+    <script src=resources/fake-devices.js></script>
+    <script src=resources/usb-helpers.js></script>
   </head>
   <body>
     <script>
       'use strict';
 
+      // Object instances used by the IDL test.
+      var usbDevice;
+      var usbConfiguration;
+      var usbInterface;
+      var usbAlternateInterface;
+      var usbEndpoint;
+      var usbConnectionEvent;
+
       promise_test(async () => {
         let response = await fetch('/interfaces/webusb.idl');
-        let idl_text = response.text();
+        let idl_text = await response.text();
         let idl_array = new IdlArray();
         idl_array.add_idls(idl_text);
 
@@ -37,6 +47,34 @@
           USBIsochronousOutTransferPacket: ['new USBIsochronousOutTransferPacket("ok")'],
         });
 
+        // If the WebUSB Test API is available then interfaces requiring an
+        // instance of USBDevice can be tested.
+        try {
+          await navigator.usb.test.initialize();
+          navigator.usb.test.addFakeDevice(fakeDeviceInit);
+          usbDevice = await new Promise(resolve => {
+            navigator.usb.onconnect = e => resolve(e.device);
+          });
+
+          usbConfiguration = usbDevice.configurations[0];
+          usbInterface = usbConfiguration.interfaces[0];
+          usbAlternateInterface = usbInterface.alternates[0];
+          usbEndpoint = usbAlternateInterface.endpoints[0];
+          usbConnectionEvent =
+              new USBConnectionEvent('connect', { device: usbDevice })
+
+          idl_array.add_objects({
+            USBAlternateInterface: ['usbAlternateInterface'],
+            USBConfiguration: ['usbConfiguration'],
+            USBConnectionEvent: ['usbConnectionEvent'],
+            USBDevice: ['usbDevice'],
+            USBEndpoint: ['usbEndpoint'],
+            USBInterface: ['usbInterface']
+          });
+        } catch (e) {
+          // Do nothing.
+        }
+
         idl_array.test();
       }, 'WebUSB IDL test');
     </script>

third_party/WebKit/LayoutTests/usb/resources/open-in-iframe.html → third_party/WebKit/LayoutTests/external/wpt/webusb/resources/open-in-iframe.html

@@ -7,7 +7,6 @@ window.onmessage = messageEvent => {
       connectEvent.device.open().then(() => {
         parent.postMessage('Success', '*');
       }).catch(error => {
-        console.log(error);
         parent.postMessage('FAIL: open rejected ' + error, '*');
       });
     });

third_party/WebKit/LayoutTests/usb/resources/usb-helpers.js → third_party/WebKit/LayoutTests/external/wpt/webusb/resources/usb-helpers.js

 'use strict';
 
+// These tests rely on the User Agent providing an implementation of the
+// WebUSB Testing API (https://wicg.github.io/webusb/test/).
+//
+// In Chromium-based browsers this implementation is provided by a polyfill
+// in order to reduce the amount of test-only code shipped to users. To enable
+// these tests the browser must be run with these options:
+//
+//   --enable-blink-features=MojoJS,MojoJSTest
+let loadChromiumResources = Promise.resolve().then(() => {
+  if (!MojoInterfaceInterceptor) {
+    // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
+    // not present in the global namespace.
+    return;
+  }
+
+  let chain = Promise.resolve();
+  [
+    '/resources/chromium/mojo_bindings.js',
+    '/resources/chromium/device.mojom.js',
+    '/resources/chromium/device_manager.mojom.js',
+    '/resources/chromium/chooser_service.mojom.js',
+    '/resources/chromium/webusb-test.js',
+  ].forEach(path => {
+    let script = document.createElement('script');
+    script.src = path;
+    script.async = false;
+    chain = chain.then(() => new Promise(resolve => {
+      script.onload = () => resolve();
+    }));
+    document.head.appendChild(script);
+  });
+
+  return chain;
+});
+
 function usb_test(func, name, properties) {
   promise_test(async () => {
-    await navigator.usb.test.initialize()
+    if (navigator.usb.test === undefined) {
+      // Try loading a polyfill for the WebUSB Testing API.
+      await loadChromiumResources;
+    }
+
+    await navigator.usb.test.initialize();
     try {
       await func();
     } finally {
@@ -72,24 +112,17 @@ function assertDeviceInfoEquals(usbDevice, deviceInit) {
   }
 }
 
-// TODO(reillyg): Remove when jyasskin upstreams this to testharness.js:
-// https://crbug.com/509058.
-function callWithKeyDown(functionCalledOnKeyPress) {
+function callWithTrustedClick(callback) {
   return new Promise(resolve => {
-    function onKeyPress() {
-      document.removeEventListener('keypress', onKeyPress, false);
-      resolve(functionCalledOnKeyPress());
-    }
-    document.addEventListener('keypress', onKeyPress, false);
-
-    eventSender.keyDown(' ', []);
-  });
-}
-
-function runGarbageCollection() {
-  // Run gc() as a promise.
-  return new Promise((resolve, reject) => {
-    GCController.collect();
-    setTimeout(resolve, 0);
+    let button = document.createElement('button');
+    button.textContent = 'click to continue test';
+    button.style.display = 'block';
+    button.style.fontSize = '20px';
+    button.style.padding = '10px';
+    button.onclick = () => {
+      resolve(callback());
+      document.body.removeChild(button);
+    };
+    document.body.appendChild(button);
   });
 }

third_party/WebKit/LayoutTests/usb/usb.html → third_party/WebKit/LayoutTests/external/wpt/webusb/usb-manual.https.html

 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script src="resources/fake-devices.js"></script>
 <script src="resources/usb-helpers.js"></script>
-<script src="resources/webusb-test.js"></script>
 <script>
 'use strict';
 
@@ -39,7 +38,7 @@ usb_test(() => {
 }, 'requestDevice rejects when called without a user gesture');
 
 usb_test(() => {
-  return callWithKeyDown(() => navigator.usb.requestDevice({ filters: [] })
+  return callWithTrustedClick(() => navigator.usb.requestDevice({ filters: [] })
     .then(device => {
       assert_unreachable('requestDevice should reject when no device selected');
     })
@@ -52,7 +51,7 @@ usb_test(() => {
 usb_test(() => {
   return getFakeDevice().then(({ device, fakeDevice }) => {
     navigator.usb.test.chosenDevice = fakeDevice;
-    return callWithKeyDown(() => {
+    return callWithTrustedClick(() => {
       return navigator.usb.requestDevice({ filters: [] }).then(chosenDevice => {
         assert_equals(chosenDevice, device);
       });
@@ -63,7 +62,7 @@ usb_test(() => {
 usb_test(() => {
   return getFakeDevice().then(({ device, fakeDevice }) => {
     navigator.usb.test.chosenDevice = fakeDevice;
-    return callWithKeyDown(() => {
+    return callWithTrustedClick(() => {
       return navigator.usb.requestDevice({ filters: [] }).then(chosenDevice => {
         assert_equals(chosenDevice, device);
         return navigator.usb.getDevices().then(devices => {
@@ -81,18 +80,19 @@ usb_test(() => {
     { vendorId: 5678, productId: 0xF00F }
   ];
 
-  return callWithKeyDown(() => navigator.usb.requestDevice({ filters: expectedFilters })
-    .then(device => {
-      assert_unreachable('requestDevice should reject because no device selected');
-    })
-    .catch(error => {
-      assert_equals(error.code, DOMException.NOT_FOUND_ERR);
-      let actualFilters = navigator.usb.test.lastFilters;
-      assert_equals(actualFilters.length, expectedFilters.length);
-      for (var i = 0; i < actualFilters.length; ++i)
-        assert_object_equals(actualFilters[i], expectedFilters[i]);
-    })
-  );
+  return callWithTrustedClick(() => {
+    return navigator.usb.requestDevice({ filters: expectedFilters })
+      .then(device => {
+        assert_unreachable('requestDevice should reject because no device selected');
+      })
+      .catch(error => {
+        assert_equals(error.code, DOMException.NOT_FOUND_ERR);
+        let actualFilters = navigator.usb.test.lastFilters;
+        assert_equals(actualFilters.length, expectedFilters.length);
+        for (var i = 0; i < actualFilters.length; ++i)
+          assert_object_equals(actualFilters[i], expectedFilters[i]);
+      });
+  });
 }, 'filters are sent correctly');
 
 usb_test(() => {

third_party/WebKit/LayoutTests/usb/usb-connection-event.html → third_party/WebKit/LayoutTests/external/wpt/webusb/usbConnectionEvent.https.html

 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script src="resources/fake-devices.js"></script>
 <script src="resources/usb-helpers.js"></script>
-<script src="resources/webusb-test.js"></script>
 <script>
 'use strict';
 

third_party/WebKit/LayoutTests/external/wpt/webusb/usbDevice-iframe.https.html

+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/fake-devices.js"></script>
+<script src="resources/usb-helpers.js"></script>
+<script>
+'use strict';
+
+function runIframeDisconnectTest(onDeviceConnected) {
+  return new Promise((resolve, reject) => {
+    let opened = false;
+
+    let iframe = document.createElement('iframe');
+    iframe.src = 'resources/open-in-iframe.html';
+    iframe.onload = () => {
+      navigator.usb.test.attachToWindow(iframe.contentWindow).then(() => {
+        iframe.contentWindow.postMessage('Ready', '*');
+      });
+    };
+
+    window.onmessage = messageEvent => {
+      if (messageEvent.data == 'Ready') {
+        let fakeDevice = navigator.usb.test.addFakeDevice(fakeDeviceInit);
+        fakeDevice.onclose = () => {
+          assert_true(opened);
+          resolve();
+        };
+      } else if (messageEvent.data == 'Success') {
+        opened = true;
+        onDeviceConnected(iframe);
+      } else {
+        reject(messageEvent.data);
+      }
+    };
+
+    document.body.appendChild(iframe);
+  });
+}
+
+usb_test(() => {
+  return runIframeDisconnectTest(iframe => {
+    document.body.removeChild(iframe);
+  });
+}, 'detaching iframe disconnects device.');
+
+usb_test(() => {
+  return runIframeDisconnectTest(iframe => {
+    iframe.src = 'about:blank';
+  });
+}, 'navigating iframe disconnects device.');
+</script>

third_party/WebKit/LayoutTests/usb/usbDevice.html → third_party/WebKit/LayoutTests/external/wpt/webusb/usbDevice.https.html

 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script src="resources/fake-devices.js"></script>
 <script src="resources/usb-helpers.js"></script>
-<script src="resources/webusb-test.js"></script>
 <script>
 'use strict';
 

third_party/WebKit/LayoutTests/usb/usb-in-transfer-result.html → third_party/WebKit/LayoutTests/external/wpt/webusb/usbInTransferResult.https.html

 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script>
 'use strict';
 

third_party/WebKit/LayoutTests/usb/usb-isochronous-in-transfer-packet.html → third_party/WebKit/LayoutTests/external/wpt/webusb/usbIsochronousInTransferPacket.https.html

 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script>
 'use strict';
 

third_party/WebKit/LayoutTests/usb/usb-isochronous-in-transfer-result.html → third_party/WebKit/LayoutTests/external/wpt/webusb/usbIsochronousInTransferResult.https.html

 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script>
 'use strict';
 

third_party/WebKit/LayoutTests/usb/usb-isochronous-out-transfer-packet.html → third_party/WebKit/LayoutTests/external/wpt/webusb/usbIsochronousOutTransferPacket.https.html

 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script>
 'use strict';
 

third_party/WebKit/LayoutTests/usb/usb-isochronous-out-transfer-result.html → third_party/WebKit/LayoutTests/external/wpt/webusb/usbIsochronousOutTransferResult.https.html

 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script>
 'use strict';
 

third_party/WebKit/LayoutTests/usb/usb-out-transfer-result.html → third_party/WebKit/LayoutTests/external/wpt/webusb/usbOutTransferResult.https.html

 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script>
 'use strict';
 

third_party/WebKit/LayoutTests/resources/testharnessreport.js

@@ -78,9 +78,11 @@
 
     function isWPTManualTest() {
         var path = location.pathname;
-        if (location.hostname == 'web-platform.test' && path.endsWith('-manual.html'))
+        if (location.hostname == 'web-platform.test'
+            && /.*-manual(\.https)?\.html$/.test(path)) {
             return true;
-        return /\/external\/wpt\/.*-manual\.html$/.test(path);
+        }
+        return /\/external\/wpt\/.*-manual(\.https)?\.html$/.test(path);
     }
 
     // Returns a directory part relative to WPT root and a basename part of the
@@ -113,8 +115,10 @@
         }
 
         var src;
-        if (pathAndBase.startsWith('/fullscreen/')) {
-            // Fullscreen tests all use the same automation script.
+        if (pathAndBase.startsWith('/fullscreen/')
+            || pathAndBase.startsWith('/webusb/')) {
+            // Fullscreen tests all use the same automation script and WebUSB
+            // tests borrow it.
             src = automationPath + '/fullscreen/auto-click.js';
         } else if (pathAndBase.startsWith('/pointerevents/')
                    || pathAndBase.startsWith('/uievents/')
@@ -268,5 +272,4 @@
             window.addEventListener('load', done);
         }
     });
-
 })();

third_party/WebKit/LayoutTests/usb/resources/webusb-test.js

-'use strict';
-
-(() => {
-  let dependencies = [
-    "file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js",
-    "file:///gen/device/usb/public/interfaces/device.mojom.js",
-    "file:///gen/device/usb/public/interfaces/device_manager.mojom.js",
-    "file:///gen/device/usb/public/interfaces/chooser_service.mojom.js",
-    "resources/webusb-test-impl.js",
-  ];
-  for (let dep of dependencies)
-    document.write("<script src='" + dep + "'></script>");
-})();

third_party/WebKit/LayoutTests/usb/test-polyfil.html

-<!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
-<script src="resources/webusb-test.js"></script>
-<script>
-'use strict';
-
-promise_test(() => {
-  return navigator.usb.test.initialize();
-}, 'WebUSB Test API available');
-</script>

third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html

 <!DOCTYPE html>
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
-<script src="resources/fake-devices.js"></script>
-<script src="resources/usb-helpers.js"></script>
-<script src="resources/webusb-test.js"></script>
+<script src="../external/wpt/webusb/resources/fake-devices.js"></script>
+<script src="../external/wpt/resources/chromium/mojo_bindings.js"></script>
+<script src="../external/wpt/resources/chromium/device.mojom.js"></script>
+<script src="../external/wpt/resources/chromium/device_manager.mojom.js"></script>
+<script src="../external/wpt/resources/chromium/chooser_service.mojom.js"></script>
+<script src="../external/wpt/resources/chromium/webusb-test.js"></script>
 <body>
 <script>
 'use strict';
 
-function runIframeDisconnectTest(onDeviceConnected) {
-  return navigator.usb.test.initialize().then(() => {
-    return new Promise((resolve, reject) => {
-      let opened = false;
-
-      let iframe = document.createElement('iframe');
-      iframe.src = 'resources/open-in-iframe.html';
-      iframe.onload = () => {
-        navigator.usb.test.attachToWindow(iframe.contentWindow).then(() => {
-          iframe.contentWindow.postMessage('Ready', '*');
-        });
-      };
-
-      window.onmessage = messageEvent => {
-        if (messageEvent.data == 'Ready') {
-          let fakeDevice = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-          fakeDevice.onclose = () => {
-            assert_true(opened);
-            resolve();
-          };
-        } else if (messageEvent.data == 'Success') {
-          opened = true;
-          onDeviceConnected(iframe);
-        } else {
-          reject(messageEvent.data);
-        }
-      };
-
-      document.body.appendChild(iframe);
-    });
-  });
-}
-
-promise_test(() => {
-  return runIframeDisconnectTest(iframe => {
-    document.body.removeChild(iframe);
-  });
-}, 'detaching iframe disconnects device.');
-
-promise_test(() => {
-  return runIframeDisconnectTest(iframe => {
-    iframe.src = 'about:blank';
-  });
-}, 'navigating iframe disconnects device.');
-
 promise_test(() => {
   return navigator.usb.test.initialize().then(() => {
     return new Promise((resolve, reject) => {
@@ -60,7 +18,7 @@ promise_test(() => {
       let fakeDeviceGuid = null;
 
       let iframe = document.createElement('iframe');
-      iframe.src = 'resources/open-in-iframe.html';
+      iframe.src = '../external/wpt/webusb/resources/open-in-iframe.html';
       iframe.onload = () => {
         navigator.usb.test.attachToWindow(iframe.contentWindow).then(() => {
           iframe.contentWindow.postMessage('Ready', '*');
@@ -70,10 +28,9 @@ promise_test(() => {
       window.onmessage = messageEvent => {
         if (messageEvent.data == 'Ready') {
           document.body.removeChild(iframe);
-          runGarbageCollection().then(() => {
-            navigator.usb.test.addFakeDevice(fakeDeviceInit);
-            resolve();
-          });
+          GCController.collect();
+          navigator.usb.test.addFakeDevice(fakeDeviceInit);
+          resolve();
         } else {
           reject(messageEvent.data);
         }