third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html - Issue 2789723003: Migrate WebUSB LayoutTests into external/wpt

Unified Diff: third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html

Issue 2789723003: Migrate WebUSB LayoutTests into external/wpt (Closed)

Patch Set: Rebased Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« third_party/WebKit/LayoutTests/usb/OWNERS ('K') | « third_party/WebKit/LayoutTests/usb/usbDevice.html ('k') | third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt.config.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html b/third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html

index b6514072106d3b1b10da023a877cb1fe70a3c2ac..fccd71f3169ace9a67310313d362e72f4dcca4e6 100644

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

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

@@ -1,60 +1,11 @@

<!DOCTYPE html>

-<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_polyfill/webusb/webusb-test.js"></script>

'use strict';

-function runIframeDisconnectTest(onDeviceConnected) {

- return navigator.usb.test.initialize().then(() => {

- return new Promise((resolve, reject) => {

- let opened = false;

- let fakeDevice = null;

- 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') {

- fakeDevice = navigator.usb.test.addFakeDevice(fakeDeviceInit);

- } else if (messageEvent.data == 'Success') {

- opened = true;

- onDeviceConnected(iframe);

- } else {

- reject(messageEvent.data);

- }

- };

- navigator.usb.test.ondeviceclose = closedFakeDevice => {

- assert_equals(closedFakeDevice, fakeDevice);

- assert_true(opened);

- resolve();

- };

- 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) => {

@@ -62,7 +13,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', '*');

@@ -72,10 +23,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);

}