From a3410e195f065d8838986b5361aacc04795f37b7 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Sat, 8 Aug 2020 08:21:32 +0000
Subject: [PATCH] Update web-platform-tests to revision
 3cc9e82a7c1a53423097f3d581d4bfc185f56d18

---
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 .../CSS2/floats/hit-test-floats-003.html.ini  |    4 -
 .../CSS2/floats/hit-test-floats-005.html.ini  |    4 -
 .../css-flexbox/scrollbars-no-margin.html.ini |    2 +
 .../css/cssom-view/CaretPosition-001.html.ini |    4 +
 .../cssom-view/elementFromPosition.html.ini   |    3 -
 .../matchMedia-display-none-iframe.html.ini   |    2 +
 .../reactions/HTMLMediaElement.html.ini       |    2 +
 .../fetch/content-type/response.window.js.ini |    7 +-
 .../fetch/content-type/script.window.js.ini   |    3 -
 .../nosniff/parsing-nosniff.window.js.ini     |    3 -
 .../traverse_the_history_1.html.ini           |    4 -
 .../traverse_the_history_3.html.ini}          |    2 +-
 ...ml.ini => traverse_the_history_5.html.ini} |    2 +-
 ...ross-origin-objects-on-new-window.html.ini |    2 -
 .../embedded-opener-remove-frame.html.ini     |    3 +-
 .../canvas-createImageBitmap-e_srgb.html.ini  |   12 +
 .../iframe_sandbox_popups_escaping-2.html.ini |    4 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |    4 +-
 .../form-double-submit-3.html.ini             |    4 +
 .../module-static-import-delayed.html.ini     |    4 -
 ...le-event-handler-settings-objects.html.ini |    3 -
 .../realtimeanalyser-fft-scaling.html.ini     |    1 +
 .../webmessaging/with-ports/017.html.ini      |    5 -
 .../webmessaging/without-ports/017.html.ini   |    5 -
 .../ar_hittest_source_cancel.https.html.ini   |   10 +
 .../importScripts/catch.sub.any.js.ini        |   19 +
 .../report-error-cross-origin.sub.any.js.ini  |   13 +
 ...or-redirect-to-cross-origin.sub.any.js.ini |   13 +
 .../report-error-same-origin.sub.any.js.ini   |    4 +
 ...ror-setTimeout-cross-origin.sub.any.js.ini |   13 +
 ...ut-redirect-to-cross-origin.sub.any.js.ini |   13 +
 ...rror-setTimeout-same-origin.sub.any.js.ini |    4 +
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 tests/wpt/metadata/MANIFEST.json              |  517 ++-
 .../CSS2/floats/hit-test-floats-003.html.ini  |    4 -
 .../CSS2/floats/hit-test-floats-005.html.ini  |    4 -
 .../css-flexbox/scrollbars-no-margin.html.ini |    2 +
 .../css/cssom-view/CaretPosition-001.html.ini |    4 +
 .../cssom-view/elementFromPosition.html.ini   |    3 -
 .../matchMedia-display-none-iframe.html.ini   |    2 +
 .../reactions/HTMLMediaElement.html.ini       |    2 +
 .../fetch/content-type/response.window.js.ini |    7 +-
 .../fetch/content-type/script.window.js.ini   |    3 -
 .../nosniff/parsing-nosniff.window.js.ini     |    3 -
 .../traverse_the_history_1.html.ini           |    4 -
 .../traverse_the_history_3.html.ini           |    4 +
 .../traverse_the_history_5.html.ini           |    4 +
 ...ross-origin-objects-on-new-window.html.ini |    2 -
 .../embedded-opener-remove-frame.html.ini     |    3 +-
 .../canvas-createImageBitmap-e_srgb.html.ini  |   12 +
 .../iframe_sandbox_popups_escaping-2.html.ini |    4 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |    4 +-
 .../form-double-submit-3.html.ini             |    4 +
 .../module-static-import-delayed.html.ini     |    4 -
 ...le-event-handler-settings-objects.html.ini |    3 -
 .../realtimeanalyser-fft-scaling.html.ini     |    1 +
 .../webmessaging/with-ports/017.html.ini      |    5 -
 .../webmessaging/without-ports/017.html.ini   |    5 -
 .../ar_hittest_source_cancel.https.html.ini   |   10 +
 .../importScripts/catch.sub.any.js.ini        |   19 +
 .../report-error-cross-origin.sub.any.js.ini  |   13 +
 ...or-redirect-to-cross-origin.sub.any.js.ini |   13 +
 .../report-error-same-origin.sub.any.js.ini   |    4 +
 ...ror-setTimeout-cross-origin.sub.any.js.ini |   13 +
 ...ut-redirect-to-cross-origin.sub.any.js.ini |   13 +
 ...rror-setTimeout-same-origin.sub.any.js.ini |    4 +
 .../mozilla/getBoundingClientRect.html.ini    |    4 -
 .../idbobjectstore_putall.tentative.any.js    |   31 +-
 .../event-dispatch.tentative.html             |    6 +-
 .../css/css-animations/support/testcommon.js  |   15 +
 .../css-flexbox/scrollbars-no-margin-ref.html |  118 +
 .../css/css-flexbox/scrollbars-no-margin.html |   99 +
 .../visibility-collapse-row-004.html          |   33 +
 .../transform-interpolation-001.html          |    1 +
 .../transform-interpolation-005.html          |    2 +-
 .../animation/translate-interpolation.html    |    1 +
 .../canvas-createImageBitmap-e_srgb.html      |   30 +-
 .../resources/pattern-srgb-transparent.avif   |  Bin 0 -> 529 bytes
 .../resources/pattern-srgb.avif               |  Bin 0 -> 330 bytes
 tests/wpt/web-platform-tests/lint.ignore      |   12 +-
 .../MediaStreamTrack-getCapabilities.html     |   15 -
 .../getPhotoCapabilities.html                 |    3 -
 .../resources/chromium/big_buffer.mojom.js    |  263 --
 .../chromium/big_buffer.mojom.js.headers      |    1 -
 .../resources/chromium/device.mojom.js        | 3788 -----------------
 .../chromium/device.mojom.js.headers          |    1 -
 .../device_enumeration_options.mojom.js       |  184 -
 ...evice_enumeration_options.mojom.js.headers |    1 -
 .../chromium/device_manager_client.mojom.js   |  262 --
 .../device_manager_client.mojom.js.headers    |    1 -
 .../resources/chromium/string16.mojom.js      |  141 -
 .../chromium/string16.mojom.js.headers        |    1 -
 .../resources/chromium/url.mojom.js           |   79 -
 .../chromium/web_usb_service.mojom.js         |  614 ---
 .../chromium/web_usb_service.mojom.js.headers |    1 -
 .../resources/test-only-api.js                |    2 +-
 .../force-load-at-top-target.html             |   15 +
 .../force-load-at-top-target.html.headers     |    1 +
 .../force-load-at-top.html                    |   60 +
 .../force-load-at-top.js                      |   33 +
 .../navigate-back.html                        |    8 +
 .../no-force-load-at-top-target.html          |   15 +
 .../no-force-load-at-top-target.html.headers  |    1 +
 .../trusted-types/support/set-inner-html.js   |    3 +
 ...sted-types-source-file-path.tentative.html |   76 +
 .../webusb/idlharness.https.any.js            |    1 +
 .../webusb/resources/open-in-iframe.html      |    2 +
 .../webusb/resources/open-in-worker.js        |    3 +-
 .../webusb/resources/usb-helpers.js           |   76 +-
 .../webusb/usb.https.any.js                   |    1 +
 .../webusb/usb.https.window.js                |    1 +
 .../webusb/usbAlternateInterface.https.any.js |    1 +
 .../webusb/usbConfiguration.https.any.js      |    1 +
 .../webusb/usbConnectionEvent.https.any.js    |    1 +
 .../webusb/usbDevice-iframe.https.html        |    1 +
 .../webusb/usbDevice-worker.https.html        |    1 +
 .../webusb/usbDevice.https.any.js             |    1 +
 .../webusb/usbEndpoint.https.any.js           |    1 +
 .../webusb/usbInTransferResult.https.any.js   |    1 +
 .../webusb/usbInterface.https.any.js          |    1 +
 .../ar_hittest_source_cancel.https.html       |  101 +
 .../importScripts/catch.sub.any.js            |   47 +
 .../report-error-cross-origin.sub.any.js      |    8 +
 .../importScripts/report-error-helper.js      |   80 +
 ...-error-redirect-to-cross-origin.sub.any.js |    9 +
 .../report-error-same-origin.sub.any.js       |    7 +
 ...t-error-setTimeout-cross-origin.sub.any.js |    8 +
 ...imeout-redirect-to-cross-origin.sub.any.js |    9 +
 ...rt-error-setTimeout-same-origin.sub.any.js |    7 +
 .../workers/modules/resources/throw.js        |    1 +
 133 files changed, 1534 insertions(+), 5642 deletions(-)
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/scrollbars-no-margin.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 rename tests/wpt/{metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini => metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini} (71%)
 rename tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/{traverse_the_history_4.html.ini => traverse_the_history_5.html.ini} (71%)
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/scrollbars-no-margin.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
 create mode 100644 tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
 delete mode 100644 tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/with-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/without-ports/017.html.ini
 create mode 100644 tests/wpt/metadata/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/getBoundingClientRect.html.ini
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-004.html
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.avif
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.avif
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/big_buffer.mojom.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/big_buffer.mojom.js.headers
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/device.mojom.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/device.mojom.js.headers
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/device_enumeration_options.mojom.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/device_enumeration_options.mojom.js.headers
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/device_manager_client.mojom.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/device_manager_client.mojom.js.headers
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/string16.mojom.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/string16.mojom.js.headers
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/url.mojom.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/web_usb_service.mojom.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/web_usb_service.mojom.js.headers
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html.headers
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.js
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/navigate-back.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html.headers
 create mode 100644 tests/wpt/web-platform-tests/trusted-types/support/set-inner-html.js
 create mode 100644 tests/wpt/web-platform-tests/trusted-types/trusted-types-source-file-path.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_source_cancel.https.html
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-helper.js
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js
 create mode 100644 tests/wpt/web-platform-tests/workers/modules/resources/throw.js

diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 3605e8f3fc9..76b44d9e9cf 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/scrollbars-no-margin.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/scrollbars-no-margin.html.ini
new file mode 100644
index 00000000000..c4bd5e69741
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/scrollbars-no-margin.html.ini
@@ -0,0 +1,2 @@
+[scrollbars-no-margin.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 35c0730f5a1..c131078eace 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -14,9 +14,6 @@
   [test some point of the element: bottom right corner]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
   [test the top of layer]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
new file mode 100644
index 00000000000..2ca05f57bb0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
@@ -0,0 +1,2 @@
+[HTMLMediaElement.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 5cbc5f156f4..1108106dc02 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -318,15 +318,12 @@
   [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*]
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 258fe374697..d2df9b78483 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,6 +56,3 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 61682d248e2..30e1b851fd4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
index 385376c7321..51f8272a6de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 385376c7321..dc2e45516de 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_5.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 8e2b6af33d8..9a85a905394 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,8 +1,7 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
   [opener of discarded nested browsing context]
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini b/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
index bd5d96d07a3..df9c5bfeb3a 100644
--- a/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
@@ -39,3 +39,15 @@
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (BMP, GIF, ICO, JPG, PNG, WEBP) with resize.]
     expected: NOTRUN
 
+  [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (AVIF, BMP, GIF, ICO, JPG, PNG, WEBP) with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (AVIF, BMP, ICO, PNG, WEBP) with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent sRGB Blob (AVIF, BMP, ICO, PNG, WEBP) with resize.]
+    expected: NOTRUN
+
+  [createImageBitmap in e-sRGB from an opaque sRGB Blob (AVIF, BMP, GIF, ICO, JPG, PNG, WEBP) with resize.]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index daa518bd0e3..c6f45be1eb2 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3080be9afc0..d913fcbb129 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index c792a071c3b..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
new file mode 100644
index 00000000000..9f416703229
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-3.html]
+  [<button> should have the same double-submit protection as <input type=submit>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 5602ea31dbe..dbec6f2c2ff 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,6 +3,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_source_cancel.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
new file mode 100644
index 00000000000..b6c39009140
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
@@ -0,0 +1,10 @@
+[ar_hittest_source_cancel.https.html]
+  [Ensures transient input hit test source cancellation works when the session has not ended.]
+    expected: FAIL
+
+  [Ensures hit test source cancellation works when the session has not ended.]
+    expected: FAIL
+
+  [Ensures transient input hit test source cancellation works when the session has ended]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js.ini
new file mode 100644
index 00000000000..4a971c04892
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js.ini
@@ -0,0 +1,19 @@
+[catch.sub.any.worker.html]
+  [Redirect-to-Cross-origin throw]
+    expected: FAIL
+
+  [Cross-origin syntax error]
+    expected: FAIL
+
+  [Cross-origin throw]
+    expected: FAIL
+
+  [Redirect-to-cross-origin syntax error]
+    expected: FAIL
+
+
+[catch.sub.any.sharedworker.html]
+  expected: ERROR
+
+[catch.sub.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js.ini
new file mode 100644
index 00000000000..04bd26d8240
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js.ini
@@ -0,0 +1,13 @@
+[report-error-cross-origin.sub.any.sharedworker.html]
+  expected: ERROR
+
+[report-error-cross-origin.sub.any.worker.html]
+  [WorkerGlobalScope error event: lineno]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: error]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: filename]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js.ini
new file mode 100644
index 00000000000..5c5d93b19bf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js.ini
@@ -0,0 +1,13 @@
+[report-error-redirect-to-cross-origin.sub.any.sharedworker.html]
+  expected: ERROR
+
+[report-error-redirect-to-cross-origin.sub.any.worker.html]
+  [WorkerGlobalScope error event: lineno]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: error]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: filename]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js.ini
new file mode 100644
index 00000000000..0b0d28413a2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js.ini
@@ -0,0 +1,4 @@
+[report-error-same-origin.sub.any.worker.html]
+
+[report-error-same-origin.sub.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js.ini
new file mode 100644
index 00000000000..5eec0806fb9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js.ini
@@ -0,0 +1,13 @@
+[report-error-setTimeout-cross-origin.sub.any.worker.html]
+  [WorkerGlobalScope error event: lineno]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: error]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: filename]
+    expected: FAIL
+
+
+[report-error-setTimeout-cross-origin.sub.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js.ini
new file mode 100644
index 00000000000..f45e5b3c620
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js.ini
@@ -0,0 +1,13 @@
+[report-error-setTimeout-redirect-to-cross-origin.sub.any.worker.html]
+  [WorkerGlobalScope error event: lineno]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: error]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: filename]
+    expected: FAIL
+
+
+[report-error-setTimeout-redirect-to-cross-origin.sub.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js.ini
new file mode 100644
index 00000000000..bc7b28f2af3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js.ini
@@ -0,0 +1,4 @@
+[report-error-setTimeout-same-origin.sub.any.sharedworker.html]
+  expected: ERROR
+
+[report-error-setTimeout-same-origin.sub.any.worker.html]
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index faa00f45ecf..d4f62ed7113 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index ceca26c219e..2bcc03b49ce 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -139992,6 +139992,19 @@
        {}
       ]
      ],
+     "scrollbars-no-margin.html": [
+      "092e4c5ea9ff6b47440f2556482f978b88f1a82e",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/scrollbars-no-margin-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "scrollbars.html": [
       "0eca05bfc63f9522e6d624c35469ba69e7410968",
       [
@@ -291517,7 +291530,7 @@
        []
       ],
       "testcommon.js": [
-       "a7575b158e3e3527963b61a4a0f2ad9a202aa66c",
+       "7d3392a54f65dca018e960874efe19f8ca388a70",
        []
       ]
      }
@@ -295281,6 +295294,10 @@
       "590b533d8d25ac45dbeb1e7eab7cd02f3c1e8b5b",
       []
      ],
+     "scrollbars-no-margin-ref.html": [
+      "eaeb36e448dbef7d96881602fed38ca4d4ea10be",
+      []
+     ],
      "scrollbars-ref.html": [
       "911e7acba88333d4e2ddf0d0fec36fbcc4975825",
       []
@@ -329715,6 +329732,10 @@
           "43a72bf271be679a932b69a5c2304d8fe547d22e",
           []
          ],
+         "pattern-srgb-transparent.avif": [
+          "c3890c5cf655552d750a0c6ff7f7398056628e29",
+          []
+         ],
          "pattern-srgb-transparent.bmp": [
           "9c9561c70464eed928e288f27163c47c1a914977",
           []
@@ -329731,6 +329752,10 @@
           "925646067ad079facaaf2d03481e36eadeb25b6f",
           []
          ],
+         "pattern-srgb.avif": [
+          "c13b320ea8249ed9962bc5973a3d1dbc69481b7b",
+          []
+         ],
          "pattern-srgb.bmp": [
           "465d203d98bf3dcce2fef2f416a1e5b3d2795319",
           []
@@ -341024,7 +341049,7 @@
     ]
    },
    "lint.ignore": [
-    "e52c2ae457638a90404fe8e4e200962314b6d441",
+    "6b79e8a757ddbc16278511d0ace1a69720f5bdb9",
     []
    ],
    "loading": {
@@ -345893,42 +345918,10 @@
       "b53c6a8c4232dbe9c787b0ea17f0ed1a49f1e386",
       []
      ],
-     "big_buffer.mojom.js": [
-      "f09706eebb82285184cdc27ad9a369f0bef54193",
-      []
-     ],
-     "big_buffer.mojom.js.headers": [
-      "6c61a34a4ec2e75096db0eb9f7748b142f0db7bb",
-      []
-     ],
      "contacts_manager_mock.js": [
       "443d50bbc62bef71e408ffba57eb6678772da224",
       []
      ],
-     "device.mojom.js": [
-      "6488cbc69c29170d9441d2210da27a464f67d445",
-      []
-     ],
-     "device.mojom.js.headers": [
-      "6805c323df5a975231648b830e33ce183c3cbbd3",
-      []
-     ],
-     "device_enumeration_options.mojom.js": [
-      "5a775ad36878f2c2a3cf05db55697b851e2a4db7",
-      []
-     ],
-     "device_enumeration_options.mojom.js.headers": [
-      "6c61a34a4ec2e75096db0eb9f7748b142f0db7bb",
-      []
-     ],
-     "device_manager_client.mojom.js": [
-      "439f646574dfa785d8f4d15994597ed156dae695",
-      []
-     ],
-     "device_manager_client.mojom.js.headers": [
-      "6c61a34a4ec2e75096db0eb9f7748b142f0db7bb",
-      []
-     ],
      "enable-hyperlink-auditing.js": [
       "263f6512f09a90220940975b9474fecabf2837c7",
       []
@@ -346017,18 +346010,6 @@
       "d82b15a304a2439f5206e5bc86b91c51fcf94bd8",
       []
      ],
-     "string16.mojom.js": [
-      "25377e66571b145907a490d17c673a5abd023171",
-      []
-     ],
-     "string16.mojom.js.headers": [
-      "6805c323df5a975231648b830e33ce183c3cbbd3",
-      []
-     ],
-     "url.mojom.js": [
-      "c5eee1f2aeb4069c595914ee022a9e509b9da545",
-      []
-     ],
      "web-bluetooth-test.js": [
       "b63658e2e753218d50508b41199fc6ff18711dbf",
       []
@@ -346037,14 +346018,6 @@
       "6805c323df5a975231648b830e33ce183c3cbbd3",
       []
      ],
-     "web_usb_service.mojom.js": [
-      "a4a017b1de178c0c51addb878d257b8b1a740334",
-      []
-     ],
-     "web_usb_service.mojom.js.headers": [
-      "6805c323df5a975231648b830e33ce183c3cbbd3",
-      []
-     ],
      "webusb-child-test.js": [
       "add04fa58250d58d56759d242663a6510d306090",
       []
@@ -346503,7 +346476,7 @@
      ]
     },
     "test-only-api.js": [
-     "53891d21bd4ea57f788d3525a7bb9145e168f2c7",
+     "ae3137481daf50639f4045d5b748977854e37984",
      []
     ],
     "test-only-api.js.headers": [
@@ -346662,6 +346635,30 @@
      "13225f6f18fb909faa65d1d6f83af2f06f9e5d7f",
      []
     ],
+    "force-load-at-top-target.html": [
+     "72feec8a4086283f2df5af5994dafc79f93d387b",
+     []
+    ],
+    "force-load-at-top-target.html.headers": [
+     "33dcdbb01ff6564e542ed621c667523a0ada4879",
+     []
+    ],
+    "force-load-at-top.js": [
+     "223e3a4b5a066038135f4ae09f4a13f527f0ed7f",
+     []
+    ],
+    "navigate-back.html": [
+     "4b4117fcc573b21f6bf6f8cb016bcef4c024d703",
+     []
+    ],
+    "no-force-load-at-top-target.html": [
+     "57e5f6d32ba80472961af1c55be073a64e18e2fb",
+     []
+    ],
+    "no-force-load-at-top-target.html.headers": [
+     "3a2c029fd6b5e013cde96bef1dcec7d7f4e4fdab",
+     []
+    ],
     "scroll-to-text-fragment-target.html": [
      "b2be85132cb8f2f2c14c82bf1854c3130f375c96",
      []
@@ -358561,6 +358558,10 @@
       "604e765da46d85fe8ab85d3097fe7c2cbe00a930",
       []
      ],
+     "set-inner-html.js": [
+      "45053d43e362e223e0ce5e6dffb4da09c0ce3f34",
+      []
+     ],
      "worker.js": [
       "4079f7e9c7933cf9ee195fe0e7a54e0f56f184ab",
       []
@@ -361394,11 +361395,11 @@
       []
      ],
      "open-in-iframe.html": [
-      "ec80bff3c234495112d780ac975288727965021e",
+      "730db24902964282a9ff2b87c0a1c0ec566449bb",
       []
      ],
      "open-in-worker.js": [
-      "b715184e04dd575e1e1d5a9bb4731e58ed6eecb5",
+      "e16621057a0240186803bb1de1c012406c89505d",
       []
      ],
      "usb-allowed-by-feature-policy-worker.js": [
@@ -361410,7 +361411,7 @@
       []
      ],
      "usb-helpers.js": [
-      "67d907d2c2f8ea056590a3735feb6044814de952",
+      "b41c054c7168bfc32ecd557f2f8c98d7fbecbfe9",
       []
      ]
     },
@@ -363851,6 +363852,10 @@
         "a17a9a3a12cefe883a5d4dee4d5a45bef120d050",
         []
        ],
+       "report-error-helper.js": [
+        "7fc6d0dd64bc82527621a90f848d080a195ed212",
+        []
+       ],
        "undefined": [
         "f99ba4be744c40c45ec3f9c58d2d1379f514c5d5",
         []
@@ -364073,6 +364078,10 @@
       "syntax-error.js": [
        "8c5c4df671bcc3f75ac1e474fc651927e57e8701",
        []
+      ],
+      "throw.js": [
+       "3d876d43d930d281c1d6aa595e527497b622e80b",
+       []
       ]
      },
      "shared-worker-options-credentials.html.headers": [
@@ -368182,7 +368191,7 @@
      ]
     ],
     "idbobjectstore_putall.tentative.any.js": [
-     "8bdc765906d86504bcb344e1e579a97f8f602c6e",
+     "a312d71d03d59c5c9369afa1492aacd0e91e9a5d",
      [
       "IndexedDB/idbobjectstore_putall.tentative.any.html",
       {
@@ -390089,7 +390098,7 @@
       ]
      ],
      "event-dispatch.tentative.html": [
-      "770f9b00b1fd3db438f6d03f7c8535cf1d2e3684",
+      "d54031c2f4a6768e10303f3584096dad96676b0c",
       [
        null,
        {
@@ -403925,6 +403934,13 @@
        {}
       ]
      ],
+     "visibility-collapse-row-004.html": [
+      "994cc89281e1a82590f4b9ea2506e44633260649",
+      [
+       null,
+       {}
+      ]
+     ],
      "visibility-collapse-row-group-001.html": [
       "ea76e902b548b7e092911b63e4bce9d1fcca1042",
       [
@@ -406529,10 +406545,12 @@
        ]
       ],
       "transform-interpolation-001.html": [
-       "4647c2c9119baa9d998f14f2f4973fc3607fd51b",
+       "7d18ef9dfa30dce2d359276cb9d4525939a5cfad",
        [
         null,
-        {}
+        {
+         "timeout": "long"
+        }
        ]
       ],
       "transform-interpolation-002.html": [
@@ -406557,10 +406575,12 @@
        ]
       ],
       "transform-interpolation-005.html": [
-       "451850f2556058a32e48bd15c7ca195ba3b8d3d8",
+       "879ff3f4358e5b64bb54837e80a6b22b7d00f70e",
        [
         null,
-        {}
+        {
+         "timeout": "long"
+        }
        ]
       ],
       "transform-interpolation-006.html": [
@@ -406634,10 +406654,12 @@
        ]
       ],
       "translate-interpolation.html": [
-       "67d9b136211670a4fe664e880feff802c95d897b",
+       "24368f01b58aef4f10e89b4325407d0bed4897b2",
        [
         null,
-        {}
+        {
+         "timeout": "long"
+        }
        ]
       ]
      },
@@ -443955,7 +443977,7 @@
          ]
         ],
         "canvas-createImageBitmap-e_srgb.html": [
-         "829e120df45fd43b7f34616ca1385d8dbee9ccf5",
+         "4bb44757ffcf7d898776f37c6d916128c38858e1",
          [
           null,
           {}
@@ -480046,7 +480068,7 @@
      ]
     ],
     "MediaStreamTrack-getCapabilities.html": [
-     "4e0c933bc1ceae2e98ec702c4044cdde056790e4",
+     "d0b7c2a3f204f3a108d7dc15696df2904373292c",
      [
       null,
       {
@@ -480085,7 +480107,7 @@
      ]
     ],
     "getPhotoCapabilities.html": [
-     "663b43a6988af1d9b98466cd260ee29ec7d4e8d8",
+     "9e2392de04d478beefab3838b382a1ff21ea8715",
      [
       null,
       {}
@@ -501040,6 +501062,15 @@
     ]
    },
    "scroll-to-text-fragment": {
+    "force-load-at-top.html": [
+     "1399de3d624927131c21ef9bf548825de4b059a4",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "scroll-to-text-fragment-api.html": [
      "8b1dea6f331bf41b4759cadf6859f016848566fa",
      [
@@ -514124,6 +514155,13 @@
       }
      ]
     ],
+    "trusted-types-source-file-path.tentative.html": [
+     "61adb2993431aef169a04afac27d3dcd36e267d6",
+     [
+      null,
+      {}
+     ]
+    ],
     "trusted-types-svg-script.tentative.html": [
      "946f825fa3eecd05247e1a2b16396ee4d3f7af11",
      [
@@ -530589,7 +530627,7 @@
    },
    "webusb": {
     "idlharness.https.any.js": [
-     "04cbf708267b0687cffc50e5138622c951b0cd9f",
+     "0c8cb322a086024b209f620ddc9a7ed1c2c1a226",
      [
       "webusb/idlharness.https.any.html",
       {
@@ -530606,6 +530644,10 @@
          "script",
          "/resources/idlharness.js"
         ],
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530634,6 +530676,10 @@
          "script",
          "/resources/idlharness.js"
         ],
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530701,11 +530747,15 @@
      ]
     ],
     "usb.https.any.js": [
-     "109c82a415684b96e4e3a85ee09e773713b58b62",
+     "c9a95b10ad1bc061a88539b4be8bac523141c534",
      [
       "webusb/usb.https.any.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530721,6 +530771,10 @@
       "webusb/usb.https.any.worker.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530734,7 +530788,7 @@
      ]
     ],
     "usb.https.window.js": [
-     "8c9e676cdfc3346ec8f057f99355fb75b708e3c1",
+     "690faf3e92de9b00eeffdf3d22272f180b19bca7",
      [
       "webusb/usb.https.window.html",
       {
@@ -530747,6 +530801,10 @@
          "script",
          "/resources/testdriver-vendor.js"
         ],
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530767,11 +530825,15 @@
      ]
     ],
     "usbAlternateInterface.https.any.js": [
-     "e5ef3844ae44008db5424275c760572a0147a518",
+     "e97d53c16dd5879a913610250051986024de22aa",
      [
       "webusb/usbAlternateInterface.https.any.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530787,6 +530849,10 @@
       "webusb/usbAlternateInterface.https.any.worker.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530800,11 +530866,15 @@
      ]
     ],
     "usbConfiguration.https.any.js": [
-     "e7d1c7fb146dcd7b50dab6088f8a0e1f14259c99",
+     "96aaee273daa37eff15e5ed2b23e9b9f82a88225",
      [
       "webusb/usbConfiguration.https.any.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530820,6 +530890,10 @@
       "webusb/usbConfiguration.https.any.worker.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530833,11 +530907,15 @@
      ]
     ],
     "usbConnectionEvent.https.any.js": [
-     "349fd9b75f3b60160d8d410fb1c81a192f3c1e36",
+     "12ede9e6c6ae9625998df32e99c62453cad022b3",
      [
       "webusb/usbConnectionEvent.https.any.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530853,6 +530931,10 @@
       "webusb/usbConnectionEvent.https.any.worker.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530866,21 +530948,21 @@
      ]
     ],
     "usbDevice-iframe.https.html": [
-     "75bad9e0c9f5223fe9b6427db1ea7afdb23dd727",
+     "5a6dd0565f51e8af904ed544dc63cb5f1cf6efea",
      [
       null,
       {}
      ]
     ],
     "usbDevice-worker.https.html": [
-     "119f5d6688235e396db1d118cec8b61324e46d8a",
+     "dcad6ec08ea0dde88c99c1ab439eb9c494a7bf68",
      [
       null,
       {}
      ]
     ],
     "usbDevice.https.any.js": [
-     "b41687079e5746ded100f0ec47c9b3f153d9adaf",
+     "5bfd841d5248e91a5cabf10d00d78db23d11f0e5",
      [
       "webusb/usbDevice.https.any.html",
       {
@@ -530889,6 +530971,10 @@
          "timeout",
          "long"
         ],
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530909,6 +530995,10 @@
          "timeout",
          "long"
         ],
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530923,11 +531013,15 @@
      ]
     ],
     "usbEndpoint.https.any.js": [
-     "e57639c3d4b9e40606978fbb17bf9d604e65337b",
+     "c987e4c33359f00c2a89e2d92e5e21fd9b71ab17",
      [
       "webusb/usbEndpoint.https.any.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530943,6 +531037,10 @@
       "webusb/usbEndpoint.https.any.worker.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530956,11 +531054,15 @@
      ]
     ],
     "usbInTransferResult.https.any.js": [
-     "c8f65f1737a5cd208273123c83322b6962a64142",
+     "dcfa38124a6d789a44c7a55fa61be9f7914491ae",
      [
       "webusb/usbInTransferResult.https.any.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530976,6 +531078,10 @@
       "webusb/usbInTransferResult.https.any.worker.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -530989,11 +531095,15 @@
      ]
     ],
     "usbInterface.https.any.js": [
-     "7fbf660bbce014f3ba2595382749ebaafef284aa",
+     "8e99c6f83f4b069dfa4ad44b470f0cadb3cc7641",
      [
       "webusb/usbInterface.https.any.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -531009,6 +531119,10 @@
       "webusb/usbInterface.https.any.worker.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/webusb/resources/fake-devices.js"
@@ -531890,6 +532004,13 @@
      ]
     ],
     "hit-test": {
+     "ar_hittest_source_cancel.https.html": [
+      "66f22b1f0c4bede2543f10f8e2cbd6ff78d981d3",
+      [
+       null,
+       {}
+      ]
+     ],
      "ar_hittest_subscription_inputSources.https.html": [
       "d419055ab264276ab6c2c2f064ab11785440bdfe",
       [
@@ -534169,6 +534290,240 @@
          null,
          {}
         ]
+       ],
+       "catch.sub.any.js": [
+        "52da60be91f62ce048f5ae1a2f81a9307a734479",
+        [
+         "workers/interfaces/WorkerUtils/importScripts/catch.sub.any.serviceworker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "worker"
+           ]
+          ]
+         }
+        ],
+        [
+         "workers/interfaces/WorkerUtils/importScripts/catch.sub.any.sharedworker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "worker"
+           ]
+          ]
+         }
+        ],
+        [
+         "workers/interfaces/WorkerUtils/importScripts/catch.sub.any.worker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "worker"
+           ]
+          ]
+         }
+        ]
+       ],
+       "report-error-cross-origin.sub.any.js": [
+        "4fd8914856b5a6cb5a70849126110705c45ae51d",
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.sharedworker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ],
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.worker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "report-error-redirect-to-cross-origin.sub.any.js": [
+        "2b9600973fb80a8cc8dc2da38818a7b7c1014e46",
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.sharedworker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ],
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.worker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "report-error-same-origin.sub.any.js": [
+        "f7de416e117086f636f4bff69805d7d55d70e02b",
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.sharedworker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ],
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.worker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "report-error-setTimeout-cross-origin.sub.any.js": [
+        "a1bbef7bc45a4455bf367d0ff7650f6d2910d037",
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.sharedworker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ],
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.worker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "report-error-setTimeout-redirect-to-cross-origin.sub.any.js": [
+        "2755b337d3dacf1b1d545e467d950042c9fd91d0",
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.sharedworker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ],
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.worker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
+       "report-error-setTimeout-same-origin.sub.any.js": [
+        "c4f70ebec973de42c3e5ec00edbc6c9a765d8983",
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.sharedworker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ],
+        [
+         "workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.worker.html",
+         {
+          "script_metadata": [
+           [
+            "global",
+            "dedicatedworker,sharedworker"
+           ],
+           [
+            "script",
+            "report-error-helper.js"
+           ]
+          ]
+         }
+        ]
        ]
       },
       "navigator": {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-flexbox/scrollbars-no-margin.html.ini b/tests/wpt/metadata/css/css-flexbox/scrollbars-no-margin.html.ini
new file mode 100644
index 00000000000..c4bd5e69741
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/scrollbars-no-margin.html.ini
@@ -0,0 +1,2 @@
+[scrollbars-no-margin.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 5733d536fd3..85e94926cb3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,6 +21,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
new file mode 100644
index 00000000000..2ca05f57bb0
--- /dev/null
+++ b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
@@ -0,0 +1,2 @@
+[HTMLMediaElement.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 8556333fa92..7d6598cebed 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -318,15 +318,12 @@
   [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*]
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 258fe374697..d2df9b78483 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,3 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 61682d248e2..30e1b851fd4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index fd369192a02..442db3cb549 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
   [opener and "removed" embedded documents]
     expected: FAIL
 
@@ -7,5 +6,5 @@
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini b/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
index bd5d96d07a3..df9c5bfeb3a 100644
--- a/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
+++ b/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
@@ -39,3 +39,15 @@
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (BMP, GIF, ICO, JPG, PNG, WEBP) with resize.]
     expected: NOTRUN
 
+  [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (AVIF, BMP, GIF, ICO, JPG, PNG, WEBP) with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (AVIF, BMP, ICO, PNG, WEBP) with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent sRGB Blob (AVIF, BMP, ICO, PNG, WEBP) with resize.]
+    expected: NOTRUN
+
+  [createImageBitmap in e-sRGB from an opaque sRGB Blob (AVIF, BMP, GIF, ICO, JPG, PNG, WEBP) with resize.]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index daa518bd0e3..c6f45be1eb2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 963d4cd20ef..9df1ac56f2a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 06bbed1fcac..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
new file mode 100644
index 00000000000..9f416703229
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-3.html]
+  [<button> should have the same double-submit protection as <input type=submit>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index edae5e5adcd..0cef5158fae 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,6 +4,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webxr/hit-test/ar_hittest_source_cancel.https.html.ini b/tests/wpt/metadata/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
new file mode 100644
index 00000000000..b6c39009140
--- /dev/null
+++ b/tests/wpt/metadata/webxr/hit-test/ar_hittest_source_cancel.https.html.ini
@@ -0,0 +1,10 @@
+[ar_hittest_source_cancel.https.html]
+  [Ensures transient input hit test source cancellation works when the session has not ended.]
+    expected: FAIL
+
+  [Ensures hit test source cancellation works when the session has not ended.]
+    expected: FAIL
+
+  [Ensures transient input hit test source cancellation works when the session has ended]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js.ini b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js.ini
new file mode 100644
index 00000000000..4a971c04892
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js.ini
@@ -0,0 +1,19 @@
+[catch.sub.any.worker.html]
+  [Redirect-to-Cross-origin throw]
+    expected: FAIL
+
+  [Cross-origin syntax error]
+    expected: FAIL
+
+  [Cross-origin throw]
+    expected: FAIL
+
+  [Redirect-to-cross-origin syntax error]
+    expected: FAIL
+
+
+[catch.sub.any.sharedworker.html]
+  expected: ERROR
+
+[catch.sub.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js.ini b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js.ini
new file mode 100644
index 00000000000..04bd26d8240
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js.ini
@@ -0,0 +1,13 @@
+[report-error-cross-origin.sub.any.sharedworker.html]
+  expected: ERROR
+
+[report-error-cross-origin.sub.any.worker.html]
+  [WorkerGlobalScope error event: lineno]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: error]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: filename]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js.ini b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js.ini
new file mode 100644
index 00000000000..5c5d93b19bf
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js.ini
@@ -0,0 +1,13 @@
+[report-error-redirect-to-cross-origin.sub.any.sharedworker.html]
+  expected: ERROR
+
+[report-error-redirect-to-cross-origin.sub.any.worker.html]
+  [WorkerGlobalScope error event: lineno]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: error]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: filename]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js.ini b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js.ini
new file mode 100644
index 00000000000..0b0d28413a2
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js.ini
@@ -0,0 +1,4 @@
+[report-error-same-origin.sub.any.worker.html]
+
+[report-error-same-origin.sub.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js.ini b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js.ini
new file mode 100644
index 00000000000..5eec0806fb9
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js.ini
@@ -0,0 +1,13 @@
+[report-error-setTimeout-cross-origin.sub.any.worker.html]
+  [WorkerGlobalScope error event: lineno]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: error]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: filename]
+    expected: FAIL
+
+
+[report-error-setTimeout-cross-origin.sub.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js.ini b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js.ini
new file mode 100644
index 00000000000..f45e5b3c620
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js.ini
@@ -0,0 +1,13 @@
+[report-error-setTimeout-redirect-to-cross-origin.sub.any.worker.html]
+  [WorkerGlobalScope error event: lineno]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: error]
+    expected: FAIL
+
+  [WorkerGlobalScope error event: filename]
+    expected: FAIL
+
+
+[report-error-setTimeout-redirect-to-cross-origin.sub.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js.ini b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js.ini
new file mode 100644
index 00000000000..bc7b28f2af3
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js.ini
@@ -0,0 +1,4 @@
+[report-error-setTimeout-same-origin.sub.any.sharedworker.html]
+  expected: ERROR
+
+[report-error-setTimeout-same-origin.sub.any.worker.html]
diff --git a/tests/wpt/mozilla/meta/mozilla/getBoundingClientRect.html.ini b/tests/wpt/mozilla/meta/mozilla/getBoundingClientRect.html.ini
deleted file mode 100644
index dcd88accd43..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/getBoundingClientRect.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[getBoundingClientRect.html]
-  [getBoundingClientRect 1]
-    expected: FAIL
-
diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_putall.tentative.any.js b/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_putall.tentative.any.js
index 8bdc765906d..a312d71d03d 100644
--- a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_putall.tentative.any.js
+++ b/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_putall.tentative.any.js
@@ -3,23 +3,24 @@
 promise_test(async testCase => {
   const db = await createDatabase(testCase, db => {
     const store = createBooksStore(testCase, db);
-    let values = [
-      {isbn: 'one', title: 'title1'},
-      {isbn: 'two', title: 'title2'},
-      {isbn: 'three', title: 'title3'}
-    ];
-    const putAllRequests = store.putAll(values);
-    putAllRequests.forEach(async request => {
-      await promiseForRequest(testCase, request);
-    });
   });
-
-  const txn = db.transaction(['books'], 'readonly');
+  const txn = db.transaction(['books'], 'readwrite');
   const objectStore = txn.objectStore('books');
-  const getRequest1 = objectStore.get('one');
-  const getRequest2 = objectStore.get('two');
-  const getRequest3 = objectStore.get('three');
+  let values = [
+    {isbn: 'one', title: 'title1'},
+    {isbn: 'two', title: 'title2'},
+    {isbn: 'three', title: 'title3'}
+  ];
+  let putAllRequest = objectStore.putAll(values);
+  await promiseForRequest(testCase, putAllRequest);
   await promiseForTransaction(testCase, txn);
+
+  const txn2 = db.transaction(['books'], 'readonly');
+  const objectStore2 = txn2.objectStore('books');
+  const getRequest1 = objectStore2.get('one');
+  const getRequest2 = objectStore2.get('two');
+  const getRequest3 = objectStore2.get('three');
+  await promiseForTransaction(testCase, txn2);
   assert_array_equals(
       [getRequest1.result.title,
           getRequest2.result.title,
@@ -27,4 +28,4 @@ promise_test(async testCase => {
       ['title1', 'title2', 'title3'],
       'All three retrieved titles should match those that were put.');
   db.close();
-}, 'Data can be successfully inputted into an object store using putAll.');
\ No newline at end of file
+}, 'Data can be successfully inputted into an object store using putAll.');
diff --git a/tests/wpt/web-platform-tests/css/css-animations/event-dispatch.tentative.html b/tests/wpt/web-platform-tests/css/css-animations/event-dispatch.tentative.html
index 770f9b00b1f..d54031c2f4a 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/event-dispatch.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-animations/event-dispatch.tentative.html
@@ -18,12 +18,14 @@
 
 const setupAnimation = (t, animationStyle) => {
   const div = addDiv(t, { style: 'animation: ' + animationStyle });
+  const animation = div.getAnimations()[0];
+  const timeoutPromise = armTimeoutWhenReady(animation, fastEventsTimeout);
+
   const watcher = new EventWatcher(t, div, [ 'animationstart',
                                              'animationiteration',
                                              'animationend',
                                              'animationcancel' ],
-                                   fastEventsTimeout);
-  const animation = div.getAnimations()[0];
+                                   timeoutPromise);
 
   return { animation, watcher, div };
 };
diff --git a/tests/wpt/web-platform-tests/css/css-animations/support/testcommon.js b/tests/wpt/web-platform-tests/css/css-animations/support/testcommon.js
index a7575b158e3..7d3392a54f6 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/support/testcommon.js
+++ b/tests/wpt/web-platform-tests/css/css-animations/support/testcommon.js
@@ -201,6 +201,21 @@ function fastEventsTimeout() {
   return waitForAnimationFrames(2);
 };
 
+/**
+ * Timeout function used for tests with EventWatchers. The client agent has no
+ * strict requirement for how long it takes to resolve the ready promise. Once
+ * the promise is resolved a secondary timeout promise is armed that may have
+ * a tight deadline measured in animation frames.
+ */
+function armTimeoutWhenReady(animation, timeoutPromise) {
+  return () => {
+    if (animation.pending)
+      return animation.ready.then(() => { return timeoutPromise(); });
+    else
+      return timeoutPromise();
+  };
+}
+
 /**
  * Wrapper that takes a sequence of N animations and returns:
  *
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin-ref.html
new file mode 100644
index 00000000000..eaeb36e448d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin-ref.html
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<head>
+
+<script src="support/scrollbars.js"></script>
+
+<style>
+.horizontal-header {
+  width: 120px;
+}
+.vertical-header {
+  width: 60px;
+}
+.container-row {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.container {
+  flex: none;
+  margin: 5px;
+}
+.ltr {
+  direction: ltr;
+}
+.rtl {
+  direction: rtl;
+}
+.horizontal {
+  writing-mode: horizontal-tb;
+}
+.flipped-blocks {
+  writing-mode: vertical-rl;
+}
+.flipped-lines {
+  writing-mode: vertical-lr;
+}
+.flex {
+  border: 2px solid red;
+  overflow: scroll;
+  max-width: 100px;
+  max-height: 100px;
+  white-space: nowrap;
+  font-size: 0;
+  scrollbar-width: thin;
+  scrollbar-color: black white;
+}
+.row > div, .row-reverse > div {
+  display: inline-flex;
+}
+.column > div, .column-reverse > div {
+  display: flex;
+}
+
+.flex > div {
+  width: 30px;
+  height: 30px;
+  border: 2px solid blue;
+  flex-direction: column;
+  justify-content: center;
+}
+.flex > div > div {
+  font-size: 20px;
+  text-align: center;
+  flex: none;
+}
+</style>
+
+</head>
+
+<div class="container-row">
+  <div class="vertical-header ltr horizontal"></div>
+  <div class="horizontal-header ltr horizontal">ltr<br>horizontal-tb</div>
+  <div class="vertical-header ltr flipped-blocks">ltr<br>vertical-rl</div>
+  <div class="vertical-header ltr flipped-blocks">ltr<br>vertical-lr</div>
+  <div class="horizontal-header rtl horizontal">rtl<br>horizontal-tb</div>
+  <div class="vertical-header rtl flipped-blocks">rtl<br>vertical-rl</div>
+  <div class="vertical-header rtl flipped-blocks">rtl<br>vertical-lr</div>
+</div>
+
+<script>
+// Override createContentNode to emulate reverse flow direction.
+createContentNode = (flexDirection, textDirection, writingMode) => {
+  var flexNode = document.createElement("div");
+  flexNode.className = "flex " + flexDirection;
+  flexNode.title = "flex-direction: " + flexDirection + "; direction: " + textDirection + "; writing-mode: " + writingMode;
+  for (var i = 1; i < 4; i++)
+    flexNode.appendChild(createLeafNode(flexDirection.endsWith("reverse") ? 4 - i : i));
+  return flexNode;
+}
+
+flexDirections.forEach((flexDirection) => {
+  var containerRow = createContainerRow(flexDirection);
+  document.body.appendChild(containerRow);
+});
+
+// Scroll all flex containers to the emulated beginning of flow.
+var nodes = document.querySelectorAll(".ltr > .row-reverse");
+for (var i = 0; i < nodes.length; i++) {
+  nodes[i].scrollLeft = 10000;
+  nodes[i].scrollTop = 10000;
+}
+nodes = document.querySelectorAll(".rtl > .row-reverse");
+for (var i = 0; i < nodes.length; i++) {
+  nodes[i].scrollLeft = -10000;
+  nodes[i].scrollTop = -10000;
+}
+nodes = document.querySelectorAll(".column-reverse");
+for (var i = 0; i < nodes.length; i++) {
+  nodes[i].scrollLeft = 10000;
+  nodes[i].scrollTop = 10000;
+}
+nodes = document.querySelectorAll(".flipped-blocks > .column-reverse");
+for (var i = 0; i < nodes.length; i++) {
+  nodes[i].scrollLeft = -10000;
+  nodes[i].scrollTop = 0;
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin.html b/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin.html
new file mode 100644
index 00000000000..092e4c5ea9f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<head>
+<title>Scrollbars inside flexbox with direction and writing-mode</title>
+<link rel="author" title="Google, Inc." href="http://www.google.com/">
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<link rel="match" href="scrollbars-no-margin-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/">
+
+<script src="support/scrollbars.js"></script>
+
+<style>
+.horizontal-header {
+  width: 120px;
+}
+.vertical-header {
+  width: 60px;
+}
+.container-row {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.container {
+  flex: none;
+  margin: 5px;
+}
+.ltr {
+  direction: ltr;
+}
+.rtl {
+  direction: rtl;
+}
+.horizontal {
+  writing-mode: horizontal-tb;
+}
+.flipped-blocks {
+  writing-mode: vertical-rl;
+}
+.flipped-lines {
+  writing-mode: vertical-lr;
+}
+.flex {
+  border: 2px solid red;
+  display: flex;
+  overflow: scroll;
+  max-width: 100px;
+  max-height: 100px;
+  font-size: 0;
+  scrollbar-width: thin;
+  scrollbar-color: black white;
+}
+.column {
+  flex-direction: column;
+}
+.column-reverse {
+  flex-direction: column-reverse;
+}
+.row {
+  flex-direction: row;
+}
+.row-reverse {
+  flex-direction: row-reverse;
+}
+.flex > .leaf1, .flex > .leaf2, .flex > .leaf3 {
+  flex: none;
+  width: 30px;
+  height: 30px;
+  border: 2px solid blue;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.flex > div > div {
+  font-size: 20px;
+  text-align: center;
+  flex: none;
+}
+</style>
+
+</head>
+
+<div class="container-row">
+  <div class="vertical-header ltr horizontal"></div>
+  <div class="horizontal-header ltr horizontal">ltr<br>horizontal-tb</div>
+  <div class="vertical-header ltr flipped-blocks">ltr<br>vertical-rl</div>
+  <div class="vertical-header ltr flipped-blocks">ltr<br>vertical-lr</div>
+  <div class="horizontal-header rtl horizontal">rtl<br>horizontal-tb</div>
+  <div class="vertical-header rtl flipped-blocks">rtl<br>vertical-rl</div>
+  <div class="vertical-header rtl flipped-blocks">rtl<br>vertical-lr</div>
+</div>
+
+<script>
+flexDirections.forEach((flexDirection) => {
+  var containerRow = createContainerRow(flexDirection);
+  document.body.appendChild(containerRow);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-004.html b/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-004.html
new file mode 100644
index 00000000000..994cc89281e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-004.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<meta charset="utf-8">
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<link rel="author" title="Aleks Totic" href="mailto:atotic@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS2/tables.html#dynamic-effects">
+<style>
+  table { background: red;}
+  td { background:green; padding: 0;}
+</style>
+<main>
+  <h1>Visibility collapse changes table height even when its height is fixed</h1>
+
+  <table style="height:150px;border-spacing: 0">
+    <tr>
+      <td style="width:50px">a</td>
+    </tr>
+    <tr style="visibility:collapse">
+      <td style="width:100px">hello</td>
+    </tr>
+    <tr>
+      <td>b</td>
+    </tr>
+  </table>
+</main>
+<script>
+  test(function() {
+    let t = document.querySelector("table");
+    assert_equals(t.offsetWidth, 100);
+    assert_equals(t.offsetHeight, 100);
+  }, "collapsed row shrinks table height");
+</script>
+
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-001.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-001.html
index 4647c2c9119..7d18ef9dfa3 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-001.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-001.html
@@ -3,6 +3,7 @@
 <title>transform interpolation</title>
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-property">
 <meta name="assert" content="transform supports animation as a transform list">
+<meta name="timeout" content="long">
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-005.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-005.html
index 451850f2556..879ff3f4358 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-005.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-005.html
@@ -3,7 +3,7 @@
 <title>transform interpolation</title>
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-property">
 <meta name="assert" content="transform supports animation as a transform list">
-
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/interpolation-testcommon.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-interpolation.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-interpolation.html
index 67d9b136211..24368f01b58 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-interpolation.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-interpolation.html
@@ -5,6 +5,7 @@
     <title>translate interpolation</title>
     <link rel="help" href="https://drafts.csswg.org/css-transforms-2/#propdef-translate">
     <meta name="assert" content="translate supports <length> and <percentage> animation.">
+    <meta name="timeout" content="long">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/css/support/interpolation-testcommon.js"></script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html
index 829e120df45..4bb44757ffc 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html
@@ -284,9 +284,9 @@ function initializeTestCanvasTransparent(canvasColorSpace, canvasPixelFormat)
 ////////////////////////////////////////////////////////////////////////////////
 
 // HTMLImageElement - Opaque sRGB
-// File formats: Bitmap, GIF, ICO, JPEG, PNG, WEBP
+// File formats: AVIF, Bitmap, GIF, ICO, JPEG, PNG, WEBP
 promise_test(function() {
-    return Promise.all(['bmp', 'gif', 'ico', 'jpg', 'png', 'webp'].map(
+    return Promise.all(['avif', 'bmp', 'gif', 'ico', 'jpg', 'png', 'webp'].map(
         ext => new Promise((resolve,reject) => {
             var image = new Image();
             image.onload = function() {
@@ -294,13 +294,13 @@ promise_test(function() {
             }
             image.src = 'resources/pattern-srgb.' + ext;
         }).then(testImageBitmapOpaque)));
-}, 'createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (BMP, \
-GIF, ICO, JPG, PNG, WEBP) with resize.');
+}, 'createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (AVIF, \
+BMP, GIF, ICO, JPG, PNG, WEBP) with resize.');
 
 // HTMLImageElement - Transparent sRGB
-// File formats: Bitmap, ICO, PNG, WEBP
+// File formats: AVIF, Bitmap, ICO, PNG, WEBP
 promise_test(function() {
-    return Promise.all(['bmp', 'ico', 'png', 'webp'].map(
+    return Promise.all(['avif', 'bmp', 'ico', 'png', 'webp'].map(
         ext => new Promise((resolve,reject) => {
             var image = new Image();
             image.onload = function() {
@@ -309,7 +309,7 @@ promise_test(function() {
             image.src = 'resources/pattern-srgb-transparent.' + ext;
         }).then(testImageBitmapFromTransparentImage)));
 }, 'createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement \
-(BMP, ICO, PNG, WEBP) with resize.');
+(AVIF, BMP, ICO, PNG, WEBP) with resize.');
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -369,9 +369,9 @@ promise_test(function() {
 //////////////////////////////////////////////////////////////////////////////
 
 // Blob from file - Opaque sRGB
-// File formats: Bitmap, GIF, ICO, JPEG, PNG, WEBP
+// File formats: AVIF, Bitmap, GIF, ICO, JPEG, PNG, WEBP
 promise_test(function() {
-    return Promise.all(['bmp', 'gif', 'ico', 'jpg', 'png', 'webp'].map(
+    return Promise.all(['avif', 'bmp', 'gif', 'ico', 'jpg', 'png', 'webp'].map(
         ext => new Promise((resolve, reject) => {
             var xhr = new XMLHttpRequest();
             xhr.open("GET", 'resources/pattern-srgb.' + ext);
@@ -381,13 +381,13 @@ promise_test(function() {
                 resolve(xhr.response);
             };
         }).then(testImageBitmapOpaque)));
-}, 'createImageBitmap in e-sRGB from an opaque sRGB Blob (BMP, GIF, ICO, JPG, \
-PNG, WEBP) with resize.');
+}, 'createImageBitmap in e-sRGB from an opaque sRGB Blob (AVIF, BMP, GIF, ICO, \
+JPG, PNG, WEBP) with resize.');
 
 // Blob form file - Transparent sRGB
-// File formats: Bitmap, ICO, PNG, WEBP
+// File formats: AVIF, Bitmap, ICO, PNG, WEBP
 promise_test(function() {
-    return Promise.all(['bmp', 'ico', 'png', 'webp'].map(
+    return Promise.all(['avif', 'bmp', 'ico', 'png', 'webp'].map(
         ext => new Promise((resolve, reject) => {
             var xhr = new XMLHttpRequest();
             xhr.open("GET", 'resources/pattern-srgb-transparent.' + ext);
@@ -397,8 +397,8 @@ promise_test(function() {
                 resolve(xhr.response);
             };
         }).then(testImageBitmapFromTransparentImage)));
-}, 'createImageBitmap in e-sRGB from a transparent sRGB Blob (BMP, ICO, PNG, \
-WEBP) with resize.');
+}, 'createImageBitmap in e-sRGB from a transparent sRGB Blob (AVIF, BMP, ICO, \
+PNG, WEBP) with resize.');
 
 // Color managed blob from canvas
 function testCreateImageBitmapFromColorManagedBlob(pixelFormat, isTransparent) {
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.avif b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.avif
new file mode 100644
index 0000000000000000000000000000000000000000..c3890c5cf655552d750a0c6ff7f7398056628e29
GIT binary patch
literal 529
zcmZuty-EW?5T1)kI3>TDLV}oRV+0j12!<<!{2*8ezQTIBGXr~f%iSd;l~D^pd<i=(
zEd&cokqEZpD_B|R3pl$mXyI_X-^_eF-^?5Ul$~fGSPvZ_ljx#jxX7ISy3qj8u3S4}
zk|V2h+B_J$00OOO;!EUsIFZQ+j9kTObgv=zEg7`{Vjwegv}eL?id7^5@^l)Ao|;54
zMG9=iQ3dO58cm=3YJgvcXvx&M=rE~L#K0aa0AyIV&s9&^^$kTJ2yanXK4AevVG~L#
z{G6P?KFY+DuImIT)-#$X>6A>(Sw0Uui}z{%G-yLg{U<@ok0rD}0t-^0M&mT4(+xb+
z750(38m5JoFvCF@*=}gk8|27>fypK-EuwJMZd6J?Fs{YU;t-1`lIOC+f!k)$EX+*L
z=T~+{dM8z`R$6g@9DPrFFPB*_`|wr!+*lfYye^;a9<SeT-Mz1-FRn{BLn=$kvd3~Y
ILGMf6H)bhj<NyEw

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.avif b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.avif
new file mode 100644
index 0000000000000000000000000000000000000000..c13b320ea8249ed9962bc5973a3d1dbc69481b7b
GIT binary patch
literal 330
zcmXv|u}Z{15S=}bBT6Eto+u~CS$Um_m6f2EPW*^<lW-%umnAMCS}A^nXz#z+2-a$8
zD}sf!Z=?5iXWq<v%ghqdsBo87)?5(a*>I5<mc{8&at!I)<W71I7*8`@{gp(Pm7CX|
zHJ{DLEL(P_^#t-Z>r(kHB@#G3lNf?y#F%;3?rxnSn!E$qce0L?NvX?r<vH8RLO)@v
zO7MU$Z0;Wdga7DTZrBS8K@fmKStpa5DD={rDs?qey20d##5JT1wnlmnz{k3xbK6CE
wU^3}eX=!nDW%uwYn1-YMofJkN_wo6v7iV7|4||`ly|;DslHUEiZ{0`DFa3=^^8f$<

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index e52c2ae4576..6b79e8a757d 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -46,6 +46,7 @@ TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.wasm
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.bmp
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.sxg
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.wbn
+TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.avif
 
 ## .gitignore
 W3C-TEST.ORG: .gitignore
@@ -714,15 +715,16 @@ WEB-PLATFORM.TEST:web-bundle/subresource-loading/subresource-loading-from-web-bu
 # https://github.com/web-platform-tests/wpt/issues/16455
 # Please consult with ecosystem-infra@chromium.org before adding more.
 MISSING DEPENDENCY: resources/test-only-api.js
-MISSING DEPENDENCY: idle-detection/interceptor.https.html
-MISSING DEPENDENCY: credential-management/support/otpcredential-helper.js
-MISSING DEPENDENCY: web-nfc/resources/nfc-helpers.js
-MISSING DEPENDENCY: shape-detection/resources/shapedetection-helpers.js
-MISSING DEPENDENCY: webxr/resources/webxr_util.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: screen_enumeration/resources/screenenumeration-helpers.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
 AHEM SYSTEM FONT: acid/acid3/test.html
diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getCapabilities.html b/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getCapabilities.html
index 4e0c933bc1c..d0b7c2a3f20 100644
--- a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getCapabilities.html
+++ b/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getCapabilities.html
@@ -77,8 +77,6 @@ function makeImageCaptureTest(hasPanTiltZoomPermissionGranted) {
           'focusMode');
     }
 
-    assert_true(capabilities.exposureCompensation instanceof
-                MediaSettingsRange);
     assert_equals(capabilities.exposureCompensation.max,
                   mockCapabilities.exposureCompensation.max);
     assert_equals(capabilities.exposureCompensation.min,
@@ -86,8 +84,6 @@ function makeImageCaptureTest(hasPanTiltZoomPermissionGranted) {
     assert_equals(capabilities.exposureCompensation.step,
                   mockCapabilities.exposureCompensation.step);
 
-    assert_true(capabilities.exposureTime instanceof
-                MediaSettingsRange);
     assert_equals(capabilities.exposureTime.max,
                   mockCapabilities.exposureTime.max);
     assert_equals(capabilities.exposureTime.min,
@@ -95,8 +91,6 @@ function makeImageCaptureTest(hasPanTiltZoomPermissionGranted) {
     assert_equals(capabilities.exposureTime.step,
                   mockCapabilities.exposureTime.step);
 
-    assert_true(capabilities.colorTemperature instanceof
-                MediaSettingsRange);
     assert_equals(capabilities.colorTemperature.max,
                   mockCapabilities.colorTemperature.max);
     assert_equals(capabilities.colorTemperature.min,
@@ -104,12 +98,10 @@ function makeImageCaptureTest(hasPanTiltZoomPermissionGranted) {
     assert_equals(capabilities.colorTemperature.step,
                   mockCapabilities.colorTemperature.step);
 
-    assert_true(capabilities.iso instanceof MediaSettingsRange);
     assert_equals(capabilities.iso.max, mockCapabilities.iso.max);
     assert_equals(capabilities.iso.min, mockCapabilities.iso.min);
     assert_equals(capabilities.iso.step, mockCapabilities.iso.step);
 
-    assert_true(capabilities.brightness instanceof MediaSettingsRange);
     assert_equals(capabilities.brightness.max,
                   mockCapabilities.brightness.max);
     assert_equals(capabilities.brightness.min,
@@ -117,7 +109,6 @@ function makeImageCaptureTest(hasPanTiltZoomPermissionGranted) {
     assert_equals(capabilities.brightness.step,
                   mockCapabilities.brightness.step);
 
-    assert_true(capabilities.contrast instanceof MediaSettingsRange);
     assert_equals(capabilities.contrast.max,
                   mockCapabilities.contrast.max);
     assert_equals(capabilities.contrast.min,
@@ -125,7 +116,6 @@ function makeImageCaptureTest(hasPanTiltZoomPermissionGranted) {
     assert_equals(capabilities.contrast.step,
                   mockCapabilities.contrast.step);
 
-    assert_true(capabilities.saturation instanceof MediaSettingsRange);
     assert_equals(capabilities.saturation.max,
                   mockCapabilities.saturation.max);
     assert_equals(capabilities.saturation.min,
@@ -133,7 +123,6 @@ function makeImageCaptureTest(hasPanTiltZoomPermissionGranted) {
     assert_equals(capabilities.saturation.step,
                   mockCapabilities.saturation.step);
 
-    assert_true(capabilities.sharpness instanceof MediaSettingsRange);
     assert_equals(capabilities.sharpness.max,
                   mockCapabilities.sharpness.max);
     assert_equals(capabilities.sharpness.min,
@@ -141,7 +130,6 @@ function makeImageCaptureTest(hasPanTiltZoomPermissionGranted) {
     assert_equals(capabilities.sharpness.step,
                   mockCapabilities.sharpness.step);
 
-    assert_true(capabilities.focusDistance instanceof MediaSettingsRange);
     assert_equals(capabilities.focusDistance.max,
                   mockCapabilities.focusDistance.max);
     assert_equals(capabilities.focusDistance.min,
@@ -150,17 +138,14 @@ function makeImageCaptureTest(hasPanTiltZoomPermissionGranted) {
                   mockCapabilities.focusDistance.step);
 
     if (ptzPermission === 'granted') {
-      assert_true(capabilities.pan instanceof MediaSettingsRange);
       assert_equals(capabilities.pan.max, mockCapabilities.pan.max);
       assert_equals(capabilities.pan.min, mockCapabilities.pan.min);
       assert_equals(capabilities.pan.step, mockCapabilities.pan.step);
 
-      assert_true(capabilities.tilt instanceof MediaSettingsRange);
       assert_equals(capabilities.tilt.max, mockCapabilities.tilt.max);
       assert_equals(capabilities.tilt.min, mockCapabilities.tilt.min);
       assert_equals(capabilities.tilt.step, mockCapabilities.tilt.step);
 
-      assert_true(capabilities.zoom instanceof MediaSettingsRange);
       assert_equals(capabilities.zoom.max, mockCapabilities.zoom.max);
       assert_equals(capabilities.zoom.min, mockCapabilities.zoom.min);
       assert_equals(capabilities.zoom.step, mockCapabilities.zoom.step);
diff --git a/tests/wpt/web-platform-tests/mediacapture-image/getPhotoCapabilities.html b/tests/wpt/web-platform-tests/mediacapture-image/getPhotoCapabilities.html
index 663b43a6988..9e2392de04d 100644
--- a/tests/wpt/web-platform-tests/mediacapture-image/getPhotoCapabilities.html
+++ b/tests/wpt/web-platform-tests/mediacapture-image/getPhotoCapabilities.html
@@ -22,17 +22,14 @@ image_capture_test(async (t, imageCaptureTest) => {
   assert_true(typeof capturer.getPhotoCapabilities == 'function');
 
   let capabilities = await capturer.getPhotoCapabilities();
-  assert_true(capabilities instanceof PhotoCapabilities);
 
   assert_equals(capabilities.redEyeReduction, 'controllable',
                 'redEyeReduction');
 
-  assert_true(capabilities.imageHeight instanceof MediaSettingsRange);
   assert_equals(capabilities.imageHeight.max, mockCapabilities.height.max);
   assert_equals(capabilities.imageHeight.min, mockCapabilities.height.min);
   assert_equals(capabilities.imageHeight.step, mockCapabilities.height.step);
 
-  assert_true(capabilities.imageWidth instanceof MediaSettingsRange);
   assert_equals(capabilities.imageWidth.max, mockCapabilities.width.max);
   assert_equals(capabilities.imageWidth.min, mockCapabilities.width.min);
   assert_equals(capabilities.imageWidth.step, mockCapabilities.width.step);
diff --git a/tests/wpt/web-platform-tests/resources/chromium/big_buffer.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/big_buffer.mojom.js
deleted file mode 100644
index f09706eebb8..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/big_buffer.mojom.js
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'mojo/public/mojom/base/big_buffer.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('mojoBase.mojom');
-
-
-
-  function BigBufferSharedMemoryRegion(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  BigBufferSharedMemoryRegion.prototype.initDefaults_ = function() {
-    this.bufferHandle = null;
-    this.size = 0;
-  };
-  BigBufferSharedMemoryRegion.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  BigBufferSharedMemoryRegion.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate BigBufferSharedMemoryRegion.bufferHandle
-    err = messageValidator.validateHandle(offset + codec.kStructHeaderSize + 0, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  BigBufferSharedMemoryRegion.encodedSize = codec.kStructHeaderSize + 8;
-
-  BigBufferSharedMemoryRegion.decode = function(decoder) {
-    var packed;
-    var val = new BigBufferSharedMemoryRegion();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.bufferHandle = decoder.decodeStruct(codec.Handle);
-    val.size = decoder.decodeStruct(codec.Uint32);
-    return val;
-  };
-
-  BigBufferSharedMemoryRegion.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(BigBufferSharedMemoryRegion.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Handle, val.bufferHandle);
-    encoder.encodeStruct(codec.Uint32, val.size);
-  };
-
-  function BigBuffer(value) {
-    this.initDefault_();
-    this.initValue_(value);
-  }
-
-
-  BigBuffer.Tags = {
-    bytes: 0,
-    sharedMemory: 1,
-    invalidBuffer: 2,
-  };
-
-  BigBuffer.prototype.initDefault_ = function() {
-    this.$data = null;
-    this.$tag = undefined;
-  }
-
-  BigBuffer.prototype.initValue_ = function(value) {
-    if (value == undefined) {
-      return;
-    }
-
-    var keys = Object.keys(value);
-    if (keys.length == 0) {
-      return;
-    }
-
-    if (keys.length > 1) {
-      throw new TypeError("You may set only one member on a union.");
-    }
-
-    var fields = [
-        "bytes",
-        "sharedMemory",
-        "invalidBuffer",
-    ];
-
-    if (fields.indexOf(keys[0]) < 0) {
-      throw new ReferenceError(keys[0] + " is not a BigBuffer member.");
-
-    }
-
-    this[keys[0]] = value[keys[0]];
-  }
-  Object.defineProperty(BigBuffer.prototype, "bytes", {
-    get: function() {
-      if (this.$tag != BigBuffer.Tags.bytes) {
-        throw new ReferenceError(
-            "BigBuffer.bytes is not currently set.");
-      }
-      return this.$data;
-    },
-
-    set: function(value) {
-      this.$tag = BigBuffer.Tags.bytes;
-      this.$data = value;
-    }
-  });
-  Object.defineProperty(BigBuffer.prototype, "sharedMemory", {
-    get: function() {
-      if (this.$tag != BigBuffer.Tags.sharedMemory) {
-        throw new ReferenceError(
-            "BigBuffer.sharedMemory is not currently set.");
-      }
-      return this.$data;
-    },
-
-    set: function(value) {
-      this.$tag = BigBuffer.Tags.sharedMemory;
-      this.$data = value;
-    }
-  });
-  Object.defineProperty(BigBuffer.prototype, "invalidBuffer", {
-    get: function() {
-      if (this.$tag != BigBuffer.Tags.invalidBuffer) {
-        throw new ReferenceError(
-            "BigBuffer.invalidBuffer is not currently set.");
-      }
-      return this.$data;
-    },
-
-    set: function(value) {
-      this.$tag = BigBuffer.Tags.invalidBuffer;
-      this.$data = value;
-    }
-  });
-
-
-    BigBuffer.encode = function(encoder, val) {
-      if (val == null) {
-        encoder.writeUint64(0);
-        encoder.writeUint64(0);
-        return;
-      }
-      if (val.$tag == undefined) {
-        throw new TypeError("Cannot encode unions with an unknown member set.");
-      }
-
-      encoder.writeUint32(16);
-      encoder.writeUint32(val.$tag);
-      switch (val.$tag) {
-        case BigBuffer.Tags.bytes:
-          encoder.encodeArrayPointer(codec.Uint8, val.bytes);
-          break;
-        case BigBuffer.Tags.sharedMemory:
-          encoder.encodeStructPointer(BigBufferSharedMemoryRegion, val.sharedMemory);
-          break;
-        case BigBuffer.Tags.invalidBuffer:
-          encoder.writeUint8(val.invalidBuffer ? 1 : 0);
-          break;
-      }
-      encoder.align();
-    };
-
-
-    BigBuffer.decode = function(decoder) {
-      var size = decoder.readUint32();
-      if (size == 0) {
-        decoder.readUint32();
-        decoder.readUint64();
-        return null;
-      }
-
-      var result = new BigBuffer();
-      var tag = decoder.readUint32();
-      switch (tag) {
-        case BigBuffer.Tags.bytes:
-          result.bytes = decoder.decodeArrayPointer(codec.Uint8);
-          break;
-        case BigBuffer.Tags.sharedMemory:
-          result.sharedMemory = decoder.decodeStructPointer(BigBufferSharedMemoryRegion);
-          break;
-        case BigBuffer.Tags.invalidBuffer:
-          result.invalidBuffer = decoder.readUint8() ? true : false;
-          break;
-      }
-      decoder.align();
-
-      return result;
-    };
-
-
-    BigBuffer.validate = function(messageValidator, offset) {
-      var size = messageValidator.decodeUnionSize(offset);
-      if (size != 16) {
-        return validator.validationError.INVALID_UNION_SIZE;
-      }
-
-      var tag = messageValidator.decodeUnionTag(offset);
-      var data_offset = offset + 8;
-      var err;
-      switch (tag) {
-        case BigBuffer.Tags.bytes:
-
-
-    // validate BigBuffer.bytes
-    err = messageValidator.validateArrayPointer(data_offset, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-          break;
-        case BigBuffer.Tags.sharedMemory:
-
-
-    // validate BigBuffer.sharedMemory
-    err = messageValidator.validateStructPointer(data_offset, BigBufferSharedMemoryRegion, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-          break;
-        case BigBuffer.Tags.invalidBuffer:
-
-
-          break;
-      }
-
-      return validator.validationError.NONE;
-    };
-
-  BigBuffer.encodedSize = 16;
-  exports.BigBufferSharedMemoryRegion = BigBufferSharedMemoryRegion;
-  exports.BigBuffer = BigBuffer;
-})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/big_buffer.mojom.js.headers b/tests/wpt/web-platform-tests/resources/chromium/big_buffer.mojom.js.headers
deleted file mode 100644
index 6c61a34a4ec..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/big_buffer.mojom.js.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript; charset=utf-8
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/device.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/device.mojom.js
deleted file mode 100644
index 6488cbc69c2..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/device.mojom.js
+++ /dev/null
@@ -1,3788 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'device/usb/public/mojom/device.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('device.mojom');
-  var string16$ =
-      mojo.internal.exposeNamespace('mojoBase.mojom');
-  if (mojo.config.autoLoadMojomDeps) {
-    mojo.internal.loadMojomIfNecessary(
-        'mojo/public/mojom/base/string16.mojom', '../../../../mojo/public/mojom/base/string16.mojom.js');
-  }
-  var url$ =
-      mojo.internal.exposeNamespace('url.mojom');
-  if (mojo.config.autoLoadMojomDeps) {
-    mojo.internal.loadMojomIfNecessary(
-        'url/mojom/url.mojom', '../../../../url/mojom/url.mojom.js');
-  }
-
-
-  var UsbOpenDeviceError = {};
-  UsbOpenDeviceError.OK = 0;
-  UsbOpenDeviceError.ACCESS_DENIED = UsbOpenDeviceError.OK + 1;
-  UsbOpenDeviceError.ALREADY_OPEN = UsbOpenDeviceError.ACCESS_DENIED + 1;
-  UsbOpenDeviceError.MIN_VALUE = 0,
-  UsbOpenDeviceError.MAX_VALUE = 2,
-
-  UsbOpenDeviceError.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    }
-    return false;
-  };
-
-  UsbOpenDeviceError.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-  var UsbTransferDirection = {};
-  UsbTransferDirection.INBOUND = 0;
-  UsbTransferDirection.OUTBOUND = UsbTransferDirection.INBOUND + 1;
-  UsbTransferDirection.MIN_VALUE = 0,
-  UsbTransferDirection.MAX_VALUE = 1,
-
-  UsbTransferDirection.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-      return true;
-    }
-    return false;
-  };
-
-  UsbTransferDirection.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-  var UsbControlTransferType = {};
-  UsbControlTransferType.STANDARD = 0;
-  UsbControlTransferType.CLASS = UsbControlTransferType.STANDARD + 1;
-  UsbControlTransferType.VENDOR = UsbControlTransferType.CLASS + 1;
-  UsbControlTransferType.RESERVED = UsbControlTransferType.VENDOR + 1;
-  UsbControlTransferType.MIN_VALUE = 0,
-  UsbControlTransferType.MAX_VALUE = 3,
-
-  UsbControlTransferType.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    }
-    return false;
-  };
-
-  UsbControlTransferType.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-  var UsbControlTransferRecipient = {};
-  UsbControlTransferRecipient.DEVICE = 0;
-  UsbControlTransferRecipient.INTERFACE = UsbControlTransferRecipient.DEVICE + 1;
-  UsbControlTransferRecipient.ENDPOINT = UsbControlTransferRecipient.INTERFACE + 1;
-  UsbControlTransferRecipient.OTHER = UsbControlTransferRecipient.ENDPOINT + 1;
-  UsbControlTransferRecipient.MIN_VALUE = 0,
-  UsbControlTransferRecipient.MAX_VALUE = 3,
-
-  UsbControlTransferRecipient.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    }
-    return false;
-  };
-
-  UsbControlTransferRecipient.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-  var UsbTransferType = {};
-  UsbTransferType.CONTROL = 0;
-  UsbTransferType.ISOCHRONOUS = UsbTransferType.CONTROL + 1;
-  UsbTransferType.BULK = UsbTransferType.ISOCHRONOUS + 1;
-  UsbTransferType.INTERRUPT = UsbTransferType.BULK + 1;
-  UsbTransferType.MIN_VALUE = 0,
-  UsbTransferType.MAX_VALUE = 3,
-
-  UsbTransferType.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    }
-    return false;
-  };
-
-  UsbTransferType.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-  var UsbSynchronizationType = {};
-  UsbSynchronizationType.NONE = 0;
-  UsbSynchronizationType.ASYNCHRONOUS = UsbSynchronizationType.NONE + 1;
-  UsbSynchronizationType.ADAPTIVE = UsbSynchronizationType.ASYNCHRONOUS + 1;
-  UsbSynchronizationType.SYNCHRONOUS = UsbSynchronizationType.ADAPTIVE + 1;
-  UsbSynchronizationType.MIN_VALUE = 0,
-  UsbSynchronizationType.MAX_VALUE = 3,
-
-  UsbSynchronizationType.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    }
-    return false;
-  };
-
-  UsbSynchronizationType.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-  var UsbUsageType = {};
-  UsbUsageType.DATA = 0;
-  UsbUsageType.FEEDBACK = UsbUsageType.DATA + 1;
-  UsbUsageType.EXPLICIT_FEEDBACK = UsbUsageType.FEEDBACK + 1;
-  UsbUsageType.PERIODIC = UsbUsageType.EXPLICIT_FEEDBACK + 1;
-  UsbUsageType.NOTIFICATION = UsbUsageType.PERIODIC + 1;
-  UsbUsageType.RESERVED = UsbUsageType.NOTIFICATION + 1;
-  UsbUsageType.MIN_VALUE = 0,
-  UsbUsageType.MAX_VALUE = 5,
-
-  UsbUsageType.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-      return true;
-    }
-    return false;
-  };
-
-  UsbUsageType.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-  var UsbTransferStatus = {};
-  UsbTransferStatus.COMPLETED = 0;
-  UsbTransferStatus.TRANSFER_ERROR = UsbTransferStatus.COMPLETED + 1;
-  UsbTransferStatus.TIMEOUT = UsbTransferStatus.TRANSFER_ERROR + 1;
-  UsbTransferStatus.CANCELLED = UsbTransferStatus.TIMEOUT + 1;
-  UsbTransferStatus.STALLED = UsbTransferStatus.CANCELLED + 1;
-  UsbTransferStatus.DISCONNECT = UsbTransferStatus.STALLED + 1;
-  UsbTransferStatus.BABBLE = UsbTransferStatus.DISCONNECT + 1;
-  UsbTransferStatus.SHORT_PACKET = UsbTransferStatus.BABBLE + 1;
-  UsbTransferStatus.PERMISSION_DENIED = UsbTransferStatus.SHORT_PACKET + 1;
-  UsbTransferStatus.MIN_VALUE = 0,
-  UsbTransferStatus.MAX_VALUE = 8,
-
-  UsbTransferStatus.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-      return true;
-    }
-    return false;
-  };
-
-  UsbTransferStatus.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-
-  function UsbEndpointInfo(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbEndpointInfo.prototype.initDefaults_ = function() {
-    this.endpointNumber = 0;
-    this.pollingInterval = 0;
-    this.direction = 0;
-    this.type = 0;
-    this.packetSize = 0;
-    this.synchronizationType = 0;
-    this.usageType = 0;
-    this.extraData = null;
-  };
-  UsbEndpointInfo.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbEndpointInfo.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 40}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate UsbEndpointInfo.direction
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 4, UsbTransferDirection);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbEndpointInfo.type
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 8, UsbTransferType);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate UsbEndpointInfo.synchronizationType
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 16, UsbSynchronizationType);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbEndpointInfo.usageType
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 20, UsbUsageType);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate UsbEndpointInfo.extraData
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 24, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbEndpointInfo.encodedSize = codec.kStructHeaderSize + 32;
-
-  UsbEndpointInfo.decode = function(decoder) {
-    var packed;
-    var val = new UsbEndpointInfo();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.endpointNumber = decoder.decodeStruct(codec.Uint8);
-    val.pollingInterval = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.direction = decoder.decodeStruct(codec.Int32);
-    val.type = decoder.decodeStruct(codec.Int32);
-    val.packetSize = decoder.decodeStruct(codec.Uint32);
-    val.synchronizationType = decoder.decodeStruct(codec.Int32);
-    val.usageType = decoder.decodeStruct(codec.Int32);
-    val.extraData = decoder.decodeArrayPointer(codec.Uint8);
-    return val;
-  };
-
-  UsbEndpointInfo.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbEndpointInfo.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.endpointNumber);
-    encoder.encodeStruct(codec.Uint8, val.pollingInterval);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStruct(codec.Int32, val.direction);
-    encoder.encodeStruct(codec.Int32, val.type);
-    encoder.encodeStruct(codec.Uint32, val.packetSize);
-    encoder.encodeStruct(codec.Int32, val.synchronizationType);
-    encoder.encodeStruct(codec.Int32, val.usageType);
-    encoder.encodeArrayPointer(codec.Uint8, val.extraData);
-  };
-  function UsbAlternateInterfaceInfo(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbAlternateInterfaceInfo.prototype.initDefaults_ = function() {
-    this.alternateSetting = 0;
-    this.classCode = 0;
-    this.subclassCode = 0;
-    this.protocolCode = 0;
-    this.interfaceName = null;
-    this.endpoints = null;
-    this.extraData = null;
-  };
-  UsbAlternateInterfaceInfo.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbAlternateInterfaceInfo.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 40}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-
-
-    // validate UsbAlternateInterfaceInfo.interfaceName
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 8, string16$.String16, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbAlternateInterfaceInfo.endpoints
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 16, 8, new codec.PointerTo(UsbEndpointInfo), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbAlternateInterfaceInfo.extraData
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 24, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbAlternateInterfaceInfo.encodedSize = codec.kStructHeaderSize + 32;
-
-  UsbAlternateInterfaceInfo.decode = function(decoder) {
-    var packed;
-    var val = new UsbAlternateInterfaceInfo();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.alternateSetting = decoder.decodeStruct(codec.Uint8);
-    val.classCode = decoder.decodeStruct(codec.Uint8);
-    val.subclassCode = decoder.decodeStruct(codec.Uint8);
-    val.protocolCode = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.interfaceName = decoder.decodeStructPointer(string16$.String16);
-    val.endpoints = decoder.decodeArrayPointer(new codec.PointerTo(UsbEndpointInfo));
-    val.extraData = decoder.decodeArrayPointer(codec.Uint8);
-    return val;
-  };
-
-  UsbAlternateInterfaceInfo.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbAlternateInterfaceInfo.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.alternateSetting);
-    encoder.encodeStruct(codec.Uint8, val.classCode);
-    encoder.encodeStruct(codec.Uint8, val.subclassCode);
-    encoder.encodeStruct(codec.Uint8, val.protocolCode);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStructPointer(string16$.String16, val.interfaceName);
-    encoder.encodeArrayPointer(new codec.PointerTo(UsbEndpointInfo), val.endpoints);
-    encoder.encodeArrayPointer(codec.Uint8, val.extraData);
-  };
-  function UsbInterfaceInfo(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbInterfaceInfo.prototype.initDefaults_ = function() {
-    this.interfaceNumber = 0;
-    this.alternates = null;
-  };
-  UsbInterfaceInfo.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbInterfaceInfo.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate UsbInterfaceInfo.alternates
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 8, 8, new codec.PointerTo(UsbAlternateInterfaceInfo), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbInterfaceInfo.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbInterfaceInfo.decode = function(decoder) {
-    var packed;
-    var val = new UsbInterfaceInfo();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.interfaceNumber = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.alternates = decoder.decodeArrayPointer(new codec.PointerTo(UsbAlternateInterfaceInfo));
-    return val;
-  };
-
-  UsbInterfaceInfo.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbInterfaceInfo.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.interfaceNumber);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeArrayPointer(new codec.PointerTo(UsbAlternateInterfaceInfo), val.alternates);
-  };
-  function UsbConfigurationInfo(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbConfigurationInfo.prototype.initDefaults_ = function() {
-    this.configurationValue = 0;
-    this.selfPowered = false;
-    this.remoteWakeup = false;
-    this.maximumPower = 0;
-    this.configurationName = null;
-    this.interfaces = null;
-    this.extraData = null;
-  };
-  UsbConfigurationInfo.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbConfigurationInfo.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 40}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate UsbConfigurationInfo.configurationName
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 8, string16$.String16, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-
-    // validate UsbConfigurationInfo.interfaces
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 16, 8, new codec.PointerTo(UsbInterfaceInfo), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbConfigurationInfo.extraData
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 24, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbConfigurationInfo.encodedSize = codec.kStructHeaderSize + 32;
-
-  UsbConfigurationInfo.decode = function(decoder) {
-    var packed;
-    var val = new UsbConfigurationInfo();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.configurationValue = decoder.decodeStruct(codec.Uint8);
-    packed = decoder.readUint8();
-    val.selfPowered = (packed >> 0) & 1 ? true : false;
-    val.remoteWakeup = (packed >> 1) & 1 ? true : false;
-    val.maximumPower = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.configurationName = decoder.decodeStructPointer(string16$.String16);
-    val.interfaces = decoder.decodeArrayPointer(new codec.PointerTo(UsbInterfaceInfo));
-    val.extraData = decoder.decodeArrayPointer(codec.Uint8);
-    return val;
-  };
-
-  UsbConfigurationInfo.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbConfigurationInfo.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.configurationValue);
-    packed = 0;
-    packed |= (val.selfPowered & 1) << 0
-    packed |= (val.remoteWakeup & 1) << 1
-    encoder.writeUint8(packed);
-    encoder.encodeStruct(codec.Uint8, val.maximumPower);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStructPointer(string16$.String16, val.configurationName);
-    encoder.encodeArrayPointer(new codec.PointerTo(UsbInterfaceInfo), val.interfaces);
-    encoder.encodeArrayPointer(codec.Uint8, val.extraData);
-  };
-  function UsbDeviceInfo(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDeviceInfo.prototype.initDefaults_ = function() {
-    this.guid = null;
-    this.usbVersionMajor = 0;
-    this.usbVersionMinor = 0;
-    this.usbVersionSubminor = 0;
-    this.classCode = 0;
-    this.subclassCode = 0;
-    this.protocolCode = 0;
-    this.vendorId = 0;
-    this.busNumber = 0;
-    this.portNumber = 0;
-    this.productId = 0;
-    this.deviceVersionMajor = 0;
-    this.deviceVersionMinor = 0;
-    this.deviceVersionSubminor = 0;
-    this.activeConfiguration = 0;
-    this.manufacturerName = null;
-    this.productName = null;
-    this.serialNumber = null;
-    this.webusbLandingPage = null;
-    this.configurations = null;
-  };
-  UsbDeviceInfo.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDeviceInfo.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 80}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDeviceInfo.guid
-    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    // validate UsbDeviceInfo.manufacturerName
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 32, string16$.String16, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDeviceInfo.productName
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 40, string16$.String16, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDeviceInfo.serialNumber
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 48, string16$.String16, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDeviceInfo.webusbLandingPage
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 56, url$.Url, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate UsbDeviceInfo.configurations
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 64, 8, new codec.PointerTo(UsbConfigurationInfo), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDeviceInfo.encodedSize = codec.kStructHeaderSize + 72;
-
-  UsbDeviceInfo.decode = function(decoder) {
-    var packed;
-    var val = new UsbDeviceInfo();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.guid = decoder.decodeStruct(codec.String);
-    val.usbVersionMajor = decoder.decodeStruct(codec.Uint8);
-    val.usbVersionMinor = decoder.decodeStruct(codec.Uint8);
-    val.usbVersionSubminor = decoder.decodeStruct(codec.Uint8);
-    val.classCode = decoder.decodeStruct(codec.Uint8);
-    val.subclassCode = decoder.decodeStruct(codec.Uint8);
-    val.protocolCode = decoder.decodeStruct(codec.Uint8);
-    val.vendorId = decoder.decodeStruct(codec.Uint16);
-    val.busNumber = decoder.decodeStruct(codec.Uint32);
-    val.portNumber = decoder.decodeStruct(codec.Uint32);
-    val.productId = decoder.decodeStruct(codec.Uint16);
-    val.deviceVersionMajor = decoder.decodeStruct(codec.Uint8);
-    val.deviceVersionMinor = decoder.decodeStruct(codec.Uint8);
-    val.deviceVersionSubminor = decoder.decodeStruct(codec.Uint8);
-    val.activeConfiguration = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.manufacturerName = decoder.decodeStructPointer(string16$.String16);
-    val.productName = decoder.decodeStructPointer(string16$.String16);
-    val.serialNumber = decoder.decodeStructPointer(string16$.String16);
-    val.webusbLandingPage = decoder.decodeStructPointer(url$.Url);
-    val.configurations = decoder.decodeArrayPointer(new codec.PointerTo(UsbConfigurationInfo));
-    return val;
-  };
-
-  UsbDeviceInfo.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDeviceInfo.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.String, val.guid);
-    encoder.encodeStruct(codec.Uint8, val.usbVersionMajor);
-    encoder.encodeStruct(codec.Uint8, val.usbVersionMinor);
-    encoder.encodeStruct(codec.Uint8, val.usbVersionSubminor);
-    encoder.encodeStruct(codec.Uint8, val.classCode);
-    encoder.encodeStruct(codec.Uint8, val.subclassCode);
-    encoder.encodeStruct(codec.Uint8, val.protocolCode);
-    encoder.encodeStruct(codec.Uint16, val.vendorId);
-    encoder.encodeStruct(codec.Uint32, val.busNumber);
-    encoder.encodeStruct(codec.Uint32, val.portNumber);
-    encoder.encodeStruct(codec.Uint16, val.productId);
-    encoder.encodeStruct(codec.Uint8, val.deviceVersionMajor);
-    encoder.encodeStruct(codec.Uint8, val.deviceVersionMinor);
-    encoder.encodeStruct(codec.Uint8, val.deviceVersionSubminor);
-    encoder.encodeStruct(codec.Uint8, val.activeConfiguration);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStructPointer(string16$.String16, val.manufacturerName);
-    encoder.encodeStructPointer(string16$.String16, val.productName);
-    encoder.encodeStructPointer(string16$.String16, val.serialNumber);
-    encoder.encodeStructPointer(url$.Url, val.webusbLandingPage);
-    encoder.encodeArrayPointer(new codec.PointerTo(UsbConfigurationInfo), val.configurations);
-  };
-  function UsbControlTransferParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbControlTransferParams.prototype.initDefaults_ = function() {
-    this.type = 0;
-    this.recipient = 0;
-    this.request = 0;
-    this.value = 0;
-    this.index = 0;
-  };
-  UsbControlTransferParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbControlTransferParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbControlTransferParams.type
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, UsbControlTransferType);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbControlTransferParams.recipient
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 4, UsbControlTransferRecipient);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbControlTransferParams.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbControlTransferParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbControlTransferParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.type = decoder.decodeStruct(codec.Int32);
-    val.recipient = decoder.decodeStruct(codec.Int32);
-    val.request = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    val.value = decoder.decodeStruct(codec.Uint16);
-    val.index = decoder.decodeStruct(codec.Uint16);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbControlTransferParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbControlTransferParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Int32, val.type);
-    encoder.encodeStruct(codec.Int32, val.recipient);
-    encoder.encodeStruct(codec.Uint8, val.request);
-    encoder.skip(1);
-    encoder.encodeStruct(codec.Uint16, val.value);
-    encoder.encodeStruct(codec.Uint16, val.index);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbIsochronousPacket(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbIsochronousPacket.prototype.initDefaults_ = function() {
-    this.length = 0;
-    this.transferredLength = 0;
-    this.status = 0;
-  };
-  UsbIsochronousPacket.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbIsochronousPacket.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-    // validate UsbIsochronousPacket.status
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 8, UsbTransferStatus);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbIsochronousPacket.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbIsochronousPacket.decode = function(decoder) {
-    var packed;
-    var val = new UsbIsochronousPacket();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.length = decoder.decodeStruct(codec.Uint32);
-    val.transferredLength = decoder.decodeStruct(codec.Uint32);
-    val.status = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbIsochronousPacket.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbIsochronousPacket.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint32, val.length);
-    encoder.encodeStruct(codec.Uint32, val.transferredLength);
-    encoder.encodeStruct(codec.Int32, val.status);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_Open_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_Open_Params.prototype.initDefaults_ = function() {
-  };
-  UsbDevice_Open_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_Open_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_Open_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  UsbDevice_Open_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_Open_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  UsbDevice_Open_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_Open_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function UsbDevice_Open_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_Open_ResponseParams.prototype.initDefaults_ = function() {
-    this.error = 0;
-  };
-  UsbDevice_Open_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_Open_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_Open_ResponseParams.error
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, UsbOpenDeviceError);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_Open_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_Open_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_Open_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.error = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_Open_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_Open_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Int32, val.error);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_Close_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_Close_Params.prototype.initDefaults_ = function() {
-  };
-  UsbDevice_Close_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_Close_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_Close_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  UsbDevice_Close_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_Close_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  UsbDevice_Close_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_Close_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function UsbDevice_Close_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_Close_ResponseParams.prototype.initDefaults_ = function() {
-  };
-  UsbDevice_Close_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_Close_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_Close_ResponseParams.encodedSize = codec.kStructHeaderSize + 0;
-
-  UsbDevice_Close_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_Close_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  UsbDevice_Close_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_Close_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function UsbDevice_SetConfiguration_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_SetConfiguration_Params.prototype.initDefaults_ = function() {
-    this.value = 0;
-  };
-  UsbDevice_SetConfiguration_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_SetConfiguration_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_SetConfiguration_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_SetConfiguration_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_SetConfiguration_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.value = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_SetConfiguration_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_SetConfiguration_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.value);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_SetConfiguration_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_SetConfiguration_ResponseParams.prototype.initDefaults_ = function() {
-    this.success = false;
-  };
-  UsbDevice_SetConfiguration_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_SetConfiguration_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_SetConfiguration_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_SetConfiguration_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_SetConfiguration_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.success = (packed >> 0) & 1 ? true : false;
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_SetConfiguration_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_SetConfiguration_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.success & 1) << 0
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_ClaimInterface_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_ClaimInterface_Params.prototype.initDefaults_ = function() {
-    this.interfaceNumber = 0;
-  };
-  UsbDevice_ClaimInterface_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_ClaimInterface_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_ClaimInterface_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_ClaimInterface_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_ClaimInterface_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.interfaceNumber = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_ClaimInterface_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_ClaimInterface_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.interfaceNumber);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_ClaimInterface_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_ClaimInterface_ResponseParams.prototype.initDefaults_ = function() {
-    this.success = false;
-  };
-  UsbDevice_ClaimInterface_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_ClaimInterface_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_ClaimInterface_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_ClaimInterface_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_ClaimInterface_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.success = (packed >> 0) & 1 ? true : false;
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_ClaimInterface_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_ClaimInterface_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.success & 1) << 0
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_ReleaseInterface_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_ReleaseInterface_Params.prototype.initDefaults_ = function() {
-    this.interfaceNumber = 0;
-  };
-  UsbDevice_ReleaseInterface_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_ReleaseInterface_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_ReleaseInterface_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_ReleaseInterface_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_ReleaseInterface_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.interfaceNumber = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_ReleaseInterface_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_ReleaseInterface_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.interfaceNumber);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_ReleaseInterface_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_ReleaseInterface_ResponseParams.prototype.initDefaults_ = function() {
-    this.success = false;
-  };
-  UsbDevice_ReleaseInterface_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_ReleaseInterface_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_ReleaseInterface_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_ReleaseInterface_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_ReleaseInterface_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.success = (packed >> 0) & 1 ? true : false;
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_ReleaseInterface_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_ReleaseInterface_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.success & 1) << 0
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_SetInterfaceAlternateSetting_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_SetInterfaceAlternateSetting_Params.prototype.initDefaults_ = function() {
-    this.interfaceNumber = 0;
-    this.alternateSetting = 0;
-  };
-  UsbDevice_SetInterfaceAlternateSetting_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_SetInterfaceAlternateSetting_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_SetInterfaceAlternateSetting_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_SetInterfaceAlternateSetting_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_SetInterfaceAlternateSetting_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.interfaceNumber = decoder.decodeStruct(codec.Uint8);
-    val.alternateSetting = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_SetInterfaceAlternateSetting_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_SetInterfaceAlternateSetting_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.interfaceNumber);
-    encoder.encodeStruct(codec.Uint8, val.alternateSetting);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_SetInterfaceAlternateSetting_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_SetInterfaceAlternateSetting_ResponseParams.prototype.initDefaults_ = function() {
-    this.success = false;
-  };
-  UsbDevice_SetInterfaceAlternateSetting_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_SetInterfaceAlternateSetting_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_SetInterfaceAlternateSetting_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_SetInterfaceAlternateSetting_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_SetInterfaceAlternateSetting_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.success = (packed >> 0) & 1 ? true : false;
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_SetInterfaceAlternateSetting_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_SetInterfaceAlternateSetting_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.success & 1) << 0
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_Reset_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_Reset_Params.prototype.initDefaults_ = function() {
-  };
-  UsbDevice_Reset_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_Reset_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_Reset_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  UsbDevice_Reset_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_Reset_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  UsbDevice_Reset_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_Reset_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function UsbDevice_Reset_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_Reset_ResponseParams.prototype.initDefaults_ = function() {
-    this.success = false;
-  };
-  UsbDevice_Reset_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_Reset_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_Reset_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_Reset_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_Reset_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.success = (packed >> 0) & 1 ? true : false;
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_Reset_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_Reset_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.success & 1) << 0
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_ClearHalt_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_ClearHalt_Params.prototype.initDefaults_ = function() {
-    this.endpoint = 0;
-  };
-  UsbDevice_ClearHalt_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_ClearHalt_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_ClearHalt_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_ClearHalt_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_ClearHalt_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.endpoint = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_ClearHalt_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_ClearHalt_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.endpoint);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_ClearHalt_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_ClearHalt_ResponseParams.prototype.initDefaults_ = function() {
-    this.success = false;
-  };
-  UsbDevice_ClearHalt_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_ClearHalt_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_ClearHalt_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_ClearHalt_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_ClearHalt_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.success = (packed >> 0) & 1 ? true : false;
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_ClearHalt_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_ClearHalt_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.success & 1) << 0
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_ControlTransferIn_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_ControlTransferIn_Params.prototype.initDefaults_ = function() {
-    this.params = null;
-    this.length = 0;
-    this.timeout = 0;
-  };
-  UsbDevice_ControlTransferIn_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_ControlTransferIn_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_ControlTransferIn_Params.params
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, UsbControlTransferParams, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_ControlTransferIn_Params.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbDevice_ControlTransferIn_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_ControlTransferIn_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.params = decoder.decodeStructPointer(UsbControlTransferParams);
-    val.length = decoder.decodeStruct(codec.Uint32);
-    val.timeout = decoder.decodeStruct(codec.Uint32);
-    return val;
-  };
-
-  UsbDevice_ControlTransferIn_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_ControlTransferIn_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStructPointer(UsbControlTransferParams, val.params);
-    encoder.encodeStruct(codec.Uint32, val.length);
-    encoder.encodeStruct(codec.Uint32, val.timeout);
-  };
-  function UsbDevice_ControlTransferIn_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_ControlTransferIn_ResponseParams.prototype.initDefaults_ = function() {
-    this.status = 0;
-    this.data = null;
-  };
-  UsbDevice_ControlTransferIn_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_ControlTransferIn_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_ControlTransferIn_ResponseParams.status
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, UsbTransferStatus);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_ControlTransferIn_ResponseParams.data
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 8, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_ControlTransferIn_ResponseParams.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbDevice_ControlTransferIn_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_ControlTransferIn_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.status = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.data = decoder.decodeArrayPointer(codec.Uint8);
-    return val;
-  };
-
-  UsbDevice_ControlTransferIn_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_ControlTransferIn_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Int32, val.status);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeArrayPointer(codec.Uint8, val.data);
-  };
-  function UsbDevice_ControlTransferOut_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_ControlTransferOut_Params.prototype.initDefaults_ = function() {
-    this.params = null;
-    this.data = null;
-    this.timeout = 0;
-  };
-  UsbDevice_ControlTransferOut_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_ControlTransferOut_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 32}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_ControlTransferOut_Params.params
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, UsbControlTransferParams, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_ControlTransferOut_Params.data
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 8, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_ControlTransferOut_Params.encodedSize = codec.kStructHeaderSize + 24;
-
-  UsbDevice_ControlTransferOut_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_ControlTransferOut_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.params = decoder.decodeStructPointer(UsbControlTransferParams);
-    val.data = decoder.decodeArrayPointer(codec.Uint8);
-    val.timeout = decoder.decodeStruct(codec.Uint32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_ControlTransferOut_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_ControlTransferOut_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStructPointer(UsbControlTransferParams, val.params);
-    encoder.encodeArrayPointer(codec.Uint8, val.data);
-    encoder.encodeStruct(codec.Uint32, val.timeout);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_ControlTransferOut_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_ControlTransferOut_ResponseParams.prototype.initDefaults_ = function() {
-    this.status = 0;
-  };
-  UsbDevice_ControlTransferOut_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_ControlTransferOut_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_ControlTransferOut_ResponseParams.status
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, UsbTransferStatus);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_ControlTransferOut_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_ControlTransferOut_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_ControlTransferOut_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.status = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_ControlTransferOut_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_ControlTransferOut_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Int32, val.status);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_GenericTransferIn_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_GenericTransferIn_Params.prototype.initDefaults_ = function() {
-    this.endpointNumber = 0;
-    this.length = 0;
-    this.timeout = 0;
-  };
-  UsbDevice_GenericTransferIn_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_GenericTransferIn_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_GenericTransferIn_Params.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbDevice_GenericTransferIn_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_GenericTransferIn_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.endpointNumber = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.length = decoder.decodeStruct(codec.Uint32);
-    val.timeout = decoder.decodeStruct(codec.Uint32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_GenericTransferIn_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_GenericTransferIn_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.endpointNumber);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStruct(codec.Uint32, val.length);
-    encoder.encodeStruct(codec.Uint32, val.timeout);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_GenericTransferIn_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_GenericTransferIn_ResponseParams.prototype.initDefaults_ = function() {
-    this.status = 0;
-    this.data = null;
-  };
-  UsbDevice_GenericTransferIn_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_GenericTransferIn_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_GenericTransferIn_ResponseParams.status
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, UsbTransferStatus);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_GenericTransferIn_ResponseParams.data
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 8, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_GenericTransferIn_ResponseParams.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbDevice_GenericTransferIn_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_GenericTransferIn_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.status = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.data = decoder.decodeArrayPointer(codec.Uint8);
-    return val;
-  };
-
-  UsbDevice_GenericTransferIn_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_GenericTransferIn_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Int32, val.status);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeArrayPointer(codec.Uint8, val.data);
-  };
-  function UsbDevice_GenericTransferOut_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_GenericTransferOut_Params.prototype.initDefaults_ = function() {
-    this.endpointNumber = 0;
-    this.timeout = 0;
-    this.data = null;
-  };
-  UsbDevice_GenericTransferOut_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_GenericTransferOut_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate UsbDevice_GenericTransferOut_Params.data
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 8, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_GenericTransferOut_Params.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbDevice_GenericTransferOut_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_GenericTransferOut_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.endpointNumber = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.timeout = decoder.decodeStruct(codec.Uint32);
-    val.data = decoder.decodeArrayPointer(codec.Uint8);
-    return val;
-  };
-
-  UsbDevice_GenericTransferOut_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_GenericTransferOut_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.endpointNumber);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStruct(codec.Uint32, val.timeout);
-    encoder.encodeArrayPointer(codec.Uint8, val.data);
-  };
-  function UsbDevice_GenericTransferOut_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_GenericTransferOut_ResponseParams.prototype.initDefaults_ = function() {
-    this.status = 0;
-  };
-  UsbDevice_GenericTransferOut_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_GenericTransferOut_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_GenericTransferOut_ResponseParams.status
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, UsbTransferStatus);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_GenericTransferOut_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_GenericTransferOut_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_GenericTransferOut_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.status = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  UsbDevice_GenericTransferOut_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_GenericTransferOut_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Int32, val.status);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function UsbDevice_IsochronousTransferIn_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_IsochronousTransferIn_Params.prototype.initDefaults_ = function() {
-    this.endpointNumber = 0;
-    this.timeout = 0;
-    this.packetLengths = null;
-  };
-  UsbDevice_IsochronousTransferIn_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_IsochronousTransferIn_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate UsbDevice_IsochronousTransferIn_Params.packetLengths
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 8, 4, codec.Uint32, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_IsochronousTransferIn_Params.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbDevice_IsochronousTransferIn_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_IsochronousTransferIn_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.endpointNumber = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.timeout = decoder.decodeStruct(codec.Uint32);
-    val.packetLengths = decoder.decodeArrayPointer(codec.Uint32);
-    return val;
-  };
-
-  UsbDevice_IsochronousTransferIn_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_IsochronousTransferIn_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.endpointNumber);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStruct(codec.Uint32, val.timeout);
-    encoder.encodeArrayPointer(codec.Uint32, val.packetLengths);
-  };
-  function UsbDevice_IsochronousTransferIn_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_IsochronousTransferIn_ResponseParams.prototype.initDefaults_ = function() {
-    this.data = null;
-    this.packets = null;
-  };
-  UsbDevice_IsochronousTransferIn_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_IsochronousTransferIn_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_IsochronousTransferIn_ResponseParams.data
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 0, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_IsochronousTransferIn_ResponseParams.packets
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 8, 8, new codec.PointerTo(UsbIsochronousPacket), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_IsochronousTransferIn_ResponseParams.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbDevice_IsochronousTransferIn_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_IsochronousTransferIn_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.data = decoder.decodeArrayPointer(codec.Uint8);
-    val.packets = decoder.decodeArrayPointer(new codec.PointerTo(UsbIsochronousPacket));
-    return val;
-  };
-
-  UsbDevice_IsochronousTransferIn_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_IsochronousTransferIn_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeArrayPointer(codec.Uint8, val.data);
-    encoder.encodeArrayPointer(new codec.PointerTo(UsbIsochronousPacket), val.packets);
-  };
-  function UsbDevice_IsochronousTransferOut_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_IsochronousTransferOut_Params.prototype.initDefaults_ = function() {
-    this.endpointNumber = 0;
-    this.timeout = 0;
-    this.data = null;
-    this.packetLengths = null;
-  };
-  UsbDevice_IsochronousTransferOut_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_IsochronousTransferOut_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 32}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate UsbDevice_IsochronousTransferOut_Params.data
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 8, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_IsochronousTransferOut_Params.packetLengths
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 16, 4, codec.Uint32, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_IsochronousTransferOut_Params.encodedSize = codec.kStructHeaderSize + 24;
-
-  UsbDevice_IsochronousTransferOut_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_IsochronousTransferOut_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.endpointNumber = decoder.decodeStruct(codec.Uint8);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.timeout = decoder.decodeStruct(codec.Uint32);
-    val.data = decoder.decodeArrayPointer(codec.Uint8);
-    val.packetLengths = decoder.decodeArrayPointer(codec.Uint32);
-    return val;
-  };
-
-  UsbDevice_IsochronousTransferOut_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_IsochronousTransferOut_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint8, val.endpointNumber);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStruct(codec.Uint32, val.timeout);
-    encoder.encodeArrayPointer(codec.Uint8, val.data);
-    encoder.encodeArrayPointer(codec.Uint32, val.packetLengths);
-  };
-  function UsbDevice_IsochronousTransferOut_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDevice_IsochronousTransferOut_ResponseParams.prototype.initDefaults_ = function() {
-    this.packets = null;
-  };
-  UsbDevice_IsochronousTransferOut_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDevice_IsochronousTransferOut_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDevice_IsochronousTransferOut_ResponseParams.packets
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 0, 8, new codec.PointerTo(UsbIsochronousPacket), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDevice_IsochronousTransferOut_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDevice_IsochronousTransferOut_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new UsbDevice_IsochronousTransferOut_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.packets = decoder.decodeArrayPointer(new codec.PointerTo(UsbIsochronousPacket));
-    return val;
-  };
-
-  UsbDevice_IsochronousTransferOut_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDevice_IsochronousTransferOut_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeArrayPointer(new codec.PointerTo(UsbIsochronousPacket), val.packets);
-  };
-  function UsbDeviceClient_OnDeviceOpened_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDeviceClient_OnDeviceOpened_Params.prototype.initDefaults_ = function() {
-  };
-  UsbDeviceClient_OnDeviceOpened_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDeviceClient_OnDeviceOpened_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDeviceClient_OnDeviceOpened_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  UsbDeviceClient_OnDeviceOpened_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDeviceClient_OnDeviceOpened_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  UsbDeviceClient_OnDeviceOpened_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDeviceClient_OnDeviceOpened_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function UsbDeviceClient_OnDeviceClosed_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDeviceClient_OnDeviceClosed_Params.prototype.initDefaults_ = function() {
-  };
-  UsbDeviceClient_OnDeviceClosed_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDeviceClient_OnDeviceClosed_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDeviceClient_OnDeviceClosed_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  UsbDeviceClient_OnDeviceClosed_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDeviceClient_OnDeviceClosed_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  UsbDeviceClient_OnDeviceClosed_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDeviceClient_OnDeviceClosed_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  var kUsbDevice_Open_Name = 0;
-  var kUsbDevice_Close_Name = 1;
-  var kUsbDevice_SetConfiguration_Name = 2;
-  var kUsbDevice_ClaimInterface_Name = 3;
-  var kUsbDevice_ReleaseInterface_Name = 4;
-  var kUsbDevice_SetInterfaceAlternateSetting_Name = 5;
-  var kUsbDevice_Reset_Name = 6;
-  var kUsbDevice_ClearHalt_Name = 7;
-  var kUsbDevice_ControlTransferIn_Name = 8;
-  var kUsbDevice_ControlTransferOut_Name = 9;
-  var kUsbDevice_GenericTransferIn_Name = 10;
-  var kUsbDevice_GenericTransferOut_Name = 11;
-  var kUsbDevice_IsochronousTransferIn_Name = 12;
-  var kUsbDevice_IsochronousTransferOut_Name = 13;
-
-  function UsbDevicePtr(handleOrPtrInfo) {
-    this.ptr = new bindings.InterfacePtrController(UsbDevice,
-                                                   handleOrPtrInfo);
-  }
-
-  function UsbDeviceAssociatedPtr(associatedInterfacePtrInfo) {
-    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
-        UsbDevice, associatedInterfacePtrInfo);
-  }
-
-  UsbDeviceAssociatedPtr.prototype =
-      Object.create(UsbDevicePtr.prototype);
-  UsbDeviceAssociatedPtr.prototype.constructor =
-      UsbDeviceAssociatedPtr;
-
-  function UsbDeviceProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-  UsbDevicePtr.prototype.open = function() {
-    return UsbDeviceProxy.prototype.open
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.open = function() {
-    var params_ = new UsbDevice_Open_Params();
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_Open_Name,
-          codec.align(UsbDevice_Open_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_Open_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_Open_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.close = function() {
-    return UsbDeviceProxy.prototype.close
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.close = function() {
-    var params_ = new UsbDevice_Close_Params();
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_Close_Name,
-          codec.align(UsbDevice_Close_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_Close_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_Close_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.setConfiguration = function() {
-    return UsbDeviceProxy.prototype.setConfiguration
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.setConfiguration = function(value) {
-    var params_ = new UsbDevice_SetConfiguration_Params();
-    params_.value = value;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_SetConfiguration_Name,
-          codec.align(UsbDevice_SetConfiguration_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_SetConfiguration_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_SetConfiguration_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.claimInterface = function() {
-    return UsbDeviceProxy.prototype.claimInterface
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.claimInterface = function(interfaceNumber) {
-    var params_ = new UsbDevice_ClaimInterface_Params();
-    params_.interfaceNumber = interfaceNumber;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_ClaimInterface_Name,
-          codec.align(UsbDevice_ClaimInterface_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_ClaimInterface_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_ClaimInterface_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.releaseInterface = function() {
-    return UsbDeviceProxy.prototype.releaseInterface
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.releaseInterface = function(interfaceNumber) {
-    var params_ = new UsbDevice_ReleaseInterface_Params();
-    params_.interfaceNumber = interfaceNumber;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_ReleaseInterface_Name,
-          codec.align(UsbDevice_ReleaseInterface_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_ReleaseInterface_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_ReleaseInterface_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.setInterfaceAlternateSetting = function() {
-    return UsbDeviceProxy.prototype.setInterfaceAlternateSetting
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.setInterfaceAlternateSetting = function(interfaceNumber, alternateSetting) {
-    var params_ = new UsbDevice_SetInterfaceAlternateSetting_Params();
-    params_.interfaceNumber = interfaceNumber;
-    params_.alternateSetting = alternateSetting;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_SetInterfaceAlternateSetting_Name,
-          codec.align(UsbDevice_SetInterfaceAlternateSetting_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_SetInterfaceAlternateSetting_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_SetInterfaceAlternateSetting_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.reset = function() {
-    return UsbDeviceProxy.prototype.reset
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.reset = function() {
-    var params_ = new UsbDevice_Reset_Params();
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_Reset_Name,
-          codec.align(UsbDevice_Reset_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_Reset_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_Reset_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.clearHalt = function() {
-    return UsbDeviceProxy.prototype.clearHalt
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.clearHalt = function(endpoint) {
-    var params_ = new UsbDevice_ClearHalt_Params();
-    params_.endpoint = endpoint;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_ClearHalt_Name,
-          codec.align(UsbDevice_ClearHalt_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_ClearHalt_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_ClearHalt_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.controlTransferIn = function() {
-    return UsbDeviceProxy.prototype.controlTransferIn
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.controlTransferIn = function(params, length, timeout) {
-    var params_ = new UsbDevice_ControlTransferIn_Params();
-    params_.params = params;
-    params_.length = length;
-    params_.timeout = timeout;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_ControlTransferIn_Name,
-          codec.align(UsbDevice_ControlTransferIn_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_ControlTransferIn_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_ControlTransferIn_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.controlTransferOut = function() {
-    return UsbDeviceProxy.prototype.controlTransferOut
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.controlTransferOut = function(params, data, timeout) {
-    var params_ = new UsbDevice_ControlTransferOut_Params();
-    params_.params = params;
-    params_.data = data;
-    params_.timeout = timeout;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_ControlTransferOut_Name,
-          codec.align(UsbDevice_ControlTransferOut_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_ControlTransferOut_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_ControlTransferOut_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.genericTransferIn = function() {
-    return UsbDeviceProxy.prototype.genericTransferIn
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.genericTransferIn = function(endpointNumber, length, timeout) {
-    var params_ = new UsbDevice_GenericTransferIn_Params();
-    params_.endpointNumber = endpointNumber;
-    params_.length = length;
-    params_.timeout = timeout;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_GenericTransferIn_Name,
-          codec.align(UsbDevice_GenericTransferIn_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_GenericTransferIn_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_GenericTransferIn_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.genericTransferOut = function() {
-    return UsbDeviceProxy.prototype.genericTransferOut
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.genericTransferOut = function(endpointNumber, data, timeout) {
-    var params_ = new UsbDevice_GenericTransferOut_Params();
-    params_.endpointNumber = endpointNumber;
-    params_.data = data;
-    params_.timeout = timeout;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_GenericTransferOut_Name,
-          codec.align(UsbDevice_GenericTransferOut_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_GenericTransferOut_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_GenericTransferOut_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.isochronousTransferIn = function() {
-    return UsbDeviceProxy.prototype.isochronousTransferIn
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.isochronousTransferIn = function(endpointNumber, packetLengths, timeout) {
-    var params_ = new UsbDevice_IsochronousTransferIn_Params();
-    params_.endpointNumber = endpointNumber;
-    params_.packetLengths = packetLengths;
-    params_.timeout = timeout;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_IsochronousTransferIn_Name,
-          codec.align(UsbDevice_IsochronousTransferIn_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_IsochronousTransferIn_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_IsochronousTransferIn_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  UsbDevicePtr.prototype.isochronousTransferOut = function() {
-    return UsbDeviceProxy.prototype.isochronousTransferOut
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceProxy.prototype.isochronousTransferOut = function(endpointNumber, data, packetLengths, timeout) {
-    var params_ = new UsbDevice_IsochronousTransferOut_Params();
-    params_.endpointNumber = endpointNumber;
-    params_.data = data;
-    params_.packetLengths = packetLengths;
-    params_.timeout = timeout;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kUsbDevice_IsochronousTransferOut_Name,
-          codec.align(UsbDevice_IsochronousTransferOut_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(UsbDevice_IsochronousTransferOut_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(UsbDevice_IsochronousTransferOut_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-
-  function UsbDeviceStub(delegate) {
-    this.delegate_ = delegate;
-  }
-  UsbDeviceStub.prototype.open = function() {
-    return this.delegate_ && this.delegate_.open && this.delegate_.open();
-  }
-  UsbDeviceStub.prototype.close = function() {
-    return this.delegate_ && this.delegate_.close && this.delegate_.close();
-  }
-  UsbDeviceStub.prototype.setConfiguration = function(value) {
-    return this.delegate_ && this.delegate_.setConfiguration && this.delegate_.setConfiguration(value);
-  }
-  UsbDeviceStub.prototype.claimInterface = function(interfaceNumber) {
-    return this.delegate_ && this.delegate_.claimInterface && this.delegate_.claimInterface(interfaceNumber);
-  }
-  UsbDeviceStub.prototype.releaseInterface = function(interfaceNumber) {
-    return this.delegate_ && this.delegate_.releaseInterface && this.delegate_.releaseInterface(interfaceNumber);
-  }
-  UsbDeviceStub.prototype.setInterfaceAlternateSetting = function(interfaceNumber, alternateSetting) {
-    return this.delegate_ && this.delegate_.setInterfaceAlternateSetting && this.delegate_.setInterfaceAlternateSetting(interfaceNumber, alternateSetting);
-  }
-  UsbDeviceStub.prototype.reset = function() {
-    return this.delegate_ && this.delegate_.reset && this.delegate_.reset();
-  }
-  UsbDeviceStub.prototype.clearHalt = function(endpoint) {
-    return this.delegate_ && this.delegate_.clearHalt && this.delegate_.clearHalt(endpoint);
-  }
-  UsbDeviceStub.prototype.controlTransferIn = function(params, length, timeout) {
-    return this.delegate_ && this.delegate_.controlTransferIn && this.delegate_.controlTransferIn(params, length, timeout);
-  }
-  UsbDeviceStub.prototype.controlTransferOut = function(params, data, timeout) {
-    return this.delegate_ && this.delegate_.controlTransferOut && this.delegate_.controlTransferOut(params, data, timeout);
-  }
-  UsbDeviceStub.prototype.genericTransferIn = function(endpointNumber, length, timeout) {
-    return this.delegate_ && this.delegate_.genericTransferIn && this.delegate_.genericTransferIn(endpointNumber, length, timeout);
-  }
-  UsbDeviceStub.prototype.genericTransferOut = function(endpointNumber, data, timeout) {
-    return this.delegate_ && this.delegate_.genericTransferOut && this.delegate_.genericTransferOut(endpointNumber, data, timeout);
-  }
-  UsbDeviceStub.prototype.isochronousTransferIn = function(endpointNumber, packetLengths, timeout) {
-    return this.delegate_ && this.delegate_.isochronousTransferIn && this.delegate_.isochronousTransferIn(endpointNumber, packetLengths, timeout);
-  }
-  UsbDeviceStub.prototype.isochronousTransferOut = function(endpointNumber, data, packetLengths, timeout) {
-    return this.delegate_ && this.delegate_.isochronousTransferOut && this.delegate_.isochronousTransferOut(endpointNumber, data, packetLengths, timeout);
-  }
-
-  UsbDeviceStub.prototype.accept = function(message) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    default:
-      return false;
-    }
-  };
-
-  UsbDeviceStub.prototype.acceptWithResponder =
-      function(message, responder) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kUsbDevice_Open_Name:
-      var params = reader.decodeStruct(UsbDevice_Open_Params);
-      this.open().then(function(response) {
-        var responseParams =
-            new UsbDevice_Open_ResponseParams();
-        responseParams.error = response.error;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_Open_Name,
-            codec.align(UsbDevice_Open_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_Open_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_Close_Name:
-      var params = reader.decodeStruct(UsbDevice_Close_Params);
-      this.close().then(function(response) {
-        var responseParams =
-            new UsbDevice_Close_ResponseParams();
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_Close_Name,
-            codec.align(UsbDevice_Close_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_Close_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_SetConfiguration_Name:
-      var params = reader.decodeStruct(UsbDevice_SetConfiguration_Params);
-      this.setConfiguration(params.value).then(function(response) {
-        var responseParams =
-            new UsbDevice_SetConfiguration_ResponseParams();
-        responseParams.success = response.success;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_SetConfiguration_Name,
-            codec.align(UsbDevice_SetConfiguration_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_SetConfiguration_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_ClaimInterface_Name:
-      var params = reader.decodeStruct(UsbDevice_ClaimInterface_Params);
-      this.claimInterface(params.interfaceNumber).then(function(response) {
-        var responseParams =
-            new UsbDevice_ClaimInterface_ResponseParams();
-        responseParams.success = response.success;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_ClaimInterface_Name,
-            codec.align(UsbDevice_ClaimInterface_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_ClaimInterface_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_ReleaseInterface_Name:
-      var params = reader.decodeStruct(UsbDevice_ReleaseInterface_Params);
-      this.releaseInterface(params.interfaceNumber).then(function(response) {
-        var responseParams =
-            new UsbDevice_ReleaseInterface_ResponseParams();
-        responseParams.success = response.success;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_ReleaseInterface_Name,
-            codec.align(UsbDevice_ReleaseInterface_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_ReleaseInterface_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_SetInterfaceAlternateSetting_Name:
-      var params = reader.decodeStruct(UsbDevice_SetInterfaceAlternateSetting_Params);
-      this.setInterfaceAlternateSetting(params.interfaceNumber, params.alternateSetting).then(function(response) {
-        var responseParams =
-            new UsbDevice_SetInterfaceAlternateSetting_ResponseParams();
-        responseParams.success = response.success;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_SetInterfaceAlternateSetting_Name,
-            codec.align(UsbDevice_SetInterfaceAlternateSetting_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_SetInterfaceAlternateSetting_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_Reset_Name:
-      var params = reader.decodeStruct(UsbDevice_Reset_Params);
-      this.reset().then(function(response) {
-        var responseParams =
-            new UsbDevice_Reset_ResponseParams();
-        responseParams.success = response.success;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_Reset_Name,
-            codec.align(UsbDevice_Reset_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_Reset_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_ClearHalt_Name:
-      var params = reader.decodeStruct(UsbDevice_ClearHalt_Params);
-      this.clearHalt(params.endpoint).then(function(response) {
-        var responseParams =
-            new UsbDevice_ClearHalt_ResponseParams();
-        responseParams.success = response.success;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_ClearHalt_Name,
-            codec.align(UsbDevice_ClearHalt_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_ClearHalt_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_ControlTransferIn_Name:
-      var params = reader.decodeStruct(UsbDevice_ControlTransferIn_Params);
-      this.controlTransferIn(params.params, params.length, params.timeout).then(function(response) {
-        var responseParams =
-            new UsbDevice_ControlTransferIn_ResponseParams();
-        responseParams.status = response.status;
-        responseParams.data = response.data;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_ControlTransferIn_Name,
-            codec.align(UsbDevice_ControlTransferIn_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_ControlTransferIn_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_ControlTransferOut_Name:
-      var params = reader.decodeStruct(UsbDevice_ControlTransferOut_Params);
-      this.controlTransferOut(params.params, params.data, params.timeout).then(function(response) {
-        var responseParams =
-            new UsbDevice_ControlTransferOut_ResponseParams();
-        responseParams.status = response.status;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_ControlTransferOut_Name,
-            codec.align(UsbDevice_ControlTransferOut_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_ControlTransferOut_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_GenericTransferIn_Name:
-      var params = reader.decodeStruct(UsbDevice_GenericTransferIn_Params);
-      this.genericTransferIn(params.endpointNumber, params.length, params.timeout).then(function(response) {
-        var responseParams =
-            new UsbDevice_GenericTransferIn_ResponseParams();
-        responseParams.status = response.status;
-        responseParams.data = response.data;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_GenericTransferIn_Name,
-            codec.align(UsbDevice_GenericTransferIn_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_GenericTransferIn_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_GenericTransferOut_Name:
-      var params = reader.decodeStruct(UsbDevice_GenericTransferOut_Params);
-      this.genericTransferOut(params.endpointNumber, params.data, params.timeout).then(function(response) {
-        var responseParams =
-            new UsbDevice_GenericTransferOut_ResponseParams();
-        responseParams.status = response.status;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_GenericTransferOut_Name,
-            codec.align(UsbDevice_GenericTransferOut_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_GenericTransferOut_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_IsochronousTransferIn_Name:
-      var params = reader.decodeStruct(UsbDevice_IsochronousTransferIn_Params);
-      this.isochronousTransferIn(params.endpointNumber, params.packetLengths, params.timeout).then(function(response) {
-        var responseParams =
-            new UsbDevice_IsochronousTransferIn_ResponseParams();
-        responseParams.data = response.data;
-        responseParams.packets = response.packets;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_IsochronousTransferIn_Name,
-            codec.align(UsbDevice_IsochronousTransferIn_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_IsochronousTransferIn_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kUsbDevice_IsochronousTransferOut_Name:
-      var params = reader.decodeStruct(UsbDevice_IsochronousTransferOut_Params);
-      this.isochronousTransferOut(params.endpointNumber, params.data, params.packetLengths, params.timeout).then(function(response) {
-        var responseParams =
-            new UsbDevice_IsochronousTransferOut_ResponseParams();
-        responseParams.packets = response.packets;
-        var builder = new codec.MessageV1Builder(
-            kUsbDevice_IsochronousTransferOut_Name,
-            codec.align(UsbDevice_IsochronousTransferOut_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(UsbDevice_IsochronousTransferOut_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  function validateUsbDeviceRequest(messageValidator) {
-    var message = messageValidator.message;
-    var paramsClass = null;
-    switch (message.getName()) {
-      case kUsbDevice_Open_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_Open_Params;
-      break;
-      case kUsbDevice_Close_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_Close_Params;
-      break;
-      case kUsbDevice_SetConfiguration_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_SetConfiguration_Params;
-      break;
-      case kUsbDevice_ClaimInterface_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_ClaimInterface_Params;
-      break;
-      case kUsbDevice_ReleaseInterface_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_ReleaseInterface_Params;
-      break;
-      case kUsbDevice_SetInterfaceAlternateSetting_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_SetInterfaceAlternateSetting_Params;
-      break;
-      case kUsbDevice_Reset_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_Reset_Params;
-      break;
-      case kUsbDevice_ClearHalt_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_ClearHalt_Params;
-      break;
-      case kUsbDevice_ControlTransferIn_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_ControlTransferIn_Params;
-      break;
-      case kUsbDevice_ControlTransferOut_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_ControlTransferOut_Params;
-      break;
-      case kUsbDevice_GenericTransferIn_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_GenericTransferIn_Params;
-      break;
-      case kUsbDevice_GenericTransferOut_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_GenericTransferOut_Params;
-      break;
-      case kUsbDevice_IsochronousTransferIn_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_IsochronousTransferIn_Params;
-      break;
-      case kUsbDevice_IsochronousTransferOut_Name:
-        if (message.expectsResponse())
-          paramsClass = UsbDevice_IsochronousTransferOut_Params;
-      break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  function validateUsbDeviceResponse(messageValidator) {
-   var message = messageValidator.message;
-   var paramsClass = null;
-   switch (message.getName()) {
-      case kUsbDevice_Open_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_Open_ResponseParams;
-        break;
-      case kUsbDevice_Close_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_Close_ResponseParams;
-        break;
-      case kUsbDevice_SetConfiguration_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_SetConfiguration_ResponseParams;
-        break;
-      case kUsbDevice_ClaimInterface_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_ClaimInterface_ResponseParams;
-        break;
-      case kUsbDevice_ReleaseInterface_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_ReleaseInterface_ResponseParams;
-        break;
-      case kUsbDevice_SetInterfaceAlternateSetting_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_SetInterfaceAlternateSetting_ResponseParams;
-        break;
-      case kUsbDevice_Reset_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_Reset_ResponseParams;
-        break;
-      case kUsbDevice_ClearHalt_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_ClearHalt_ResponseParams;
-        break;
-      case kUsbDevice_ControlTransferIn_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_ControlTransferIn_ResponseParams;
-        break;
-      case kUsbDevice_ControlTransferOut_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_ControlTransferOut_ResponseParams;
-        break;
-      case kUsbDevice_GenericTransferIn_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_GenericTransferIn_ResponseParams;
-        break;
-      case kUsbDevice_GenericTransferOut_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_GenericTransferOut_ResponseParams;
-        break;
-      case kUsbDevice_IsochronousTransferIn_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_IsochronousTransferIn_ResponseParams;
-        break;
-      case kUsbDevice_IsochronousTransferOut_Name:
-        if (message.isResponse())
-          paramsClass = UsbDevice_IsochronousTransferOut_ResponseParams;
-        break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  var UsbDevice = {
-    name: 'device.mojom.UsbDevice',
-    kVersion: 0,
-    ptrClass: UsbDevicePtr,
-    proxyClass: UsbDeviceProxy,
-    stubClass: UsbDeviceStub,
-    validateRequest: validateUsbDeviceRequest,
-    validateResponse: validateUsbDeviceResponse,
-  };
-  UsbDeviceStub.prototype.validator = validateUsbDeviceRequest;
-  UsbDeviceProxy.prototype.validator = validateUsbDeviceResponse;
-  var kUsbDeviceClient_OnDeviceOpened_Name = 0;
-  var kUsbDeviceClient_OnDeviceClosed_Name = 1;
-
-  function UsbDeviceClientPtr(handleOrPtrInfo) {
-    this.ptr = new bindings.InterfacePtrController(UsbDeviceClient,
-                                                   handleOrPtrInfo);
-  }
-
-  function UsbDeviceClientAssociatedPtr(associatedInterfacePtrInfo) {
-    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
-        UsbDeviceClient, associatedInterfacePtrInfo);
-  }
-
-  UsbDeviceClientAssociatedPtr.prototype =
-      Object.create(UsbDeviceClientPtr.prototype);
-  UsbDeviceClientAssociatedPtr.prototype.constructor =
-      UsbDeviceClientAssociatedPtr;
-
-  function UsbDeviceClientProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-  UsbDeviceClientPtr.prototype.onDeviceOpened = function() {
-    return UsbDeviceClientProxy.prototype.onDeviceOpened
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceClientProxy.prototype.onDeviceOpened = function() {
-    var params_ = new UsbDeviceClient_OnDeviceOpened_Params();
-    var builder = new codec.MessageV0Builder(
-        kUsbDeviceClient_OnDeviceOpened_Name,
-        codec.align(UsbDeviceClient_OnDeviceOpened_Params.encodedSize));
-    builder.encodeStruct(UsbDeviceClient_OnDeviceOpened_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-  UsbDeviceClientPtr.prototype.onDeviceClosed = function() {
-    return UsbDeviceClientProxy.prototype.onDeviceClosed
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceClientProxy.prototype.onDeviceClosed = function() {
-    var params_ = new UsbDeviceClient_OnDeviceClosed_Params();
-    var builder = new codec.MessageV0Builder(
-        kUsbDeviceClient_OnDeviceClosed_Name,
-        codec.align(UsbDeviceClient_OnDeviceClosed_Params.encodedSize));
-    builder.encodeStruct(UsbDeviceClient_OnDeviceClosed_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-
-  function UsbDeviceClientStub(delegate) {
-    this.delegate_ = delegate;
-  }
-  UsbDeviceClientStub.prototype.onDeviceOpened = function() {
-    return this.delegate_ && this.delegate_.onDeviceOpened && this.delegate_.onDeviceOpened();
-  }
-  UsbDeviceClientStub.prototype.onDeviceClosed = function() {
-    return this.delegate_ && this.delegate_.onDeviceClosed && this.delegate_.onDeviceClosed();
-  }
-
-  UsbDeviceClientStub.prototype.accept = function(message) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kUsbDeviceClient_OnDeviceOpened_Name:
-      var params = reader.decodeStruct(UsbDeviceClient_OnDeviceOpened_Params);
-      this.onDeviceOpened();
-      return true;
-    case kUsbDeviceClient_OnDeviceClosed_Name:
-      var params = reader.decodeStruct(UsbDeviceClient_OnDeviceClosed_Params);
-      this.onDeviceClosed();
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  UsbDeviceClientStub.prototype.acceptWithResponder =
-      function(message, responder) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    default:
-      return false;
-    }
-  };
-
-  function validateUsbDeviceClientRequest(messageValidator) {
-    var message = messageValidator.message;
-    var paramsClass = null;
-    switch (message.getName()) {
-      case kUsbDeviceClient_OnDeviceOpened_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = UsbDeviceClient_OnDeviceOpened_Params;
-      break;
-      case kUsbDeviceClient_OnDeviceClosed_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = UsbDeviceClient_OnDeviceClosed_Params;
-      break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  function validateUsbDeviceClientResponse(messageValidator) {
-    return validator.validationError.NONE;
-  }
-
-  var UsbDeviceClient = {
-    name: 'device.mojom.UsbDeviceClient',
-    kVersion: 0,
-    ptrClass: UsbDeviceClientPtr,
-    proxyClass: UsbDeviceClientProxy,
-    stubClass: UsbDeviceClientStub,
-    validateRequest: validateUsbDeviceClientRequest,
-    validateResponse: null,
-  };
-  UsbDeviceClientStub.prototype.validator = validateUsbDeviceClientRequest;
-  UsbDeviceClientProxy.prototype.validator = null;
-  exports.UsbOpenDeviceError = UsbOpenDeviceError;
-  exports.UsbTransferDirection = UsbTransferDirection;
-  exports.UsbControlTransferType = UsbControlTransferType;
-  exports.UsbControlTransferRecipient = UsbControlTransferRecipient;
-  exports.UsbTransferType = UsbTransferType;
-  exports.UsbSynchronizationType = UsbSynchronizationType;
-  exports.UsbUsageType = UsbUsageType;
-  exports.UsbTransferStatus = UsbTransferStatus;
-  exports.UsbEndpointInfo = UsbEndpointInfo;
-  exports.UsbAlternateInterfaceInfo = UsbAlternateInterfaceInfo;
-  exports.UsbInterfaceInfo = UsbInterfaceInfo;
-  exports.UsbConfigurationInfo = UsbConfigurationInfo;
-  exports.UsbDeviceInfo = UsbDeviceInfo;
-  exports.UsbControlTransferParams = UsbControlTransferParams;
-  exports.UsbIsochronousPacket = UsbIsochronousPacket;
-  exports.UsbDevice = UsbDevice;
-  exports.UsbDevicePtr = UsbDevicePtr;
-  exports.UsbDeviceAssociatedPtr = UsbDeviceAssociatedPtr;
-  exports.UsbDeviceClient = UsbDeviceClient;
-  exports.UsbDeviceClientPtr = UsbDeviceClientPtr;
-  exports.UsbDeviceClientAssociatedPtr = UsbDeviceClientAssociatedPtr;
-})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/device.mojom.js.headers b/tests/wpt/web-platform-tests/resources/chromium/device.mojom.js.headers
deleted file mode 100644
index 6805c323df5..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/device.mojom.js.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript; charset=utf-8
diff --git a/tests/wpt/web-platform-tests/resources/chromium/device_enumeration_options.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/device_enumeration_options.mojom.js
deleted file mode 100644
index 5a775ad3687..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/device_enumeration_options.mojom.js
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'device/usb/public/mojom/device_enumeration_options.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('device.mojom');
-  var string16$ =
-      mojo.internal.exposeNamespace('mojoBase.mojom');
-  if (mojo.config.autoLoadMojomDeps) {
-    mojo.internal.loadMojomIfNecessary(
-        'mojo/public/mojom/base/string16.mojom', '../../../../mojo/public/mojom/base/string16.mojom.js');
-  }
-
-
-
-  function UsbDeviceFilter(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDeviceFilter.prototype.initDefaults_ = function() {
-    this.hasVendorId = false;
-    this.hasProductId = false;
-    this.hasClassCode = false;
-    this.hasSubclassCode = false;
-    this.hasProtocolCode = false;
-    this.classCode = 0;
-    this.vendorId = 0;
-    this.productId = 0;
-    this.subclassCode = 0;
-    this.protocolCode = 0;
-    this.serialNumber = null;
-  };
-  UsbDeviceFilter.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDeviceFilter.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-
-
-
-
-
-
-
-
-    // validate UsbDeviceFilter.serialNumber
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 8, string16$.String16, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDeviceFilter.encodedSize = codec.kStructHeaderSize + 16;
-
-  UsbDeviceFilter.decode = function(decoder) {
-    var packed;
-    var val = new UsbDeviceFilter();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.hasVendorId = (packed >> 0) & 1 ? true : false;
-    val.hasProductId = (packed >> 1) & 1 ? true : false;
-    val.hasClassCode = (packed >> 2) & 1 ? true : false;
-    val.hasSubclassCode = (packed >> 3) & 1 ? true : false;
-    val.hasProtocolCode = (packed >> 4) & 1 ? true : false;
-    val.classCode = decoder.decodeStruct(codec.Uint8);
-    val.vendorId = decoder.decodeStruct(codec.Uint16);
-    val.productId = decoder.decodeStruct(codec.Uint16);
-    val.subclassCode = decoder.decodeStruct(codec.Uint8);
-    val.protocolCode = decoder.decodeStruct(codec.Uint8);
-    val.serialNumber = decoder.decodeStructPointer(string16$.String16);
-    return val;
-  };
-
-  UsbDeviceFilter.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDeviceFilter.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.hasVendorId & 1) << 0
-    packed |= (val.hasProductId & 1) << 1
-    packed |= (val.hasClassCode & 1) << 2
-    packed |= (val.hasSubclassCode & 1) << 3
-    packed |= (val.hasProtocolCode & 1) << 4
-    encoder.writeUint8(packed);
-    encoder.encodeStruct(codec.Uint8, val.classCode);
-    encoder.encodeStruct(codec.Uint16, val.vendorId);
-    encoder.encodeStruct(codec.Uint16, val.productId);
-    encoder.encodeStruct(codec.Uint8, val.subclassCode);
-    encoder.encodeStruct(codec.Uint8, val.protocolCode);
-    encoder.encodeStructPointer(string16$.String16, val.serialNumber);
-  };
-  function UsbEnumerationOptions(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbEnumerationOptions.prototype.initDefaults_ = function() {
-    this.filters = null;
-  };
-  UsbEnumerationOptions.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbEnumerationOptions.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbEnumerationOptions.filters
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 0, 8, new codec.PointerTo(UsbDeviceFilter), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbEnumerationOptions.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbEnumerationOptions.decode = function(decoder) {
-    var packed;
-    var val = new UsbEnumerationOptions();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.filters = decoder.decodeArrayPointer(new codec.PointerTo(UsbDeviceFilter));
-    return val;
-  };
-
-  UsbEnumerationOptions.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbEnumerationOptions.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeArrayPointer(new codec.PointerTo(UsbDeviceFilter), val.filters);
-  };
-  exports.UsbDeviceFilter = UsbDeviceFilter;
-  exports.UsbEnumerationOptions = UsbEnumerationOptions;
-})();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/device_enumeration_options.mojom.js.headers b/tests/wpt/web-platform-tests/resources/chromium/device_enumeration_options.mojom.js.headers
deleted file mode 100644
index 6c61a34a4ec..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/device_enumeration_options.mojom.js.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript; charset=utf-8
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/device_manager_client.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/device_manager_client.mojom.js
deleted file mode 100644
index 439f646574d..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/device_manager_client.mojom.js
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'device/usb/public/mojom/device_manager_client.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('device.mojom');
-  var device$ =
-      mojo.internal.exposeNamespace('device.mojom');
-  if (mojo.config.autoLoadMojomDeps) {
-    mojo.internal.loadMojomIfNecessary(
-        'device/usb/public/mojom/device.mojom', 'device.mojom.js');
-  }
-
-
-
-  function UsbDeviceManagerClient_OnDeviceAdded_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDeviceManagerClient_OnDeviceAdded_Params.prototype.initDefaults_ = function() {
-    this.deviceInfo = null;
-  };
-  UsbDeviceManagerClient_OnDeviceAdded_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDeviceManagerClient_OnDeviceAdded_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDeviceManagerClient_OnDeviceAdded_Params.deviceInfo
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, device$.UsbDeviceInfo, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDeviceManagerClient_OnDeviceAdded_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDeviceManagerClient_OnDeviceAdded_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDeviceManagerClient_OnDeviceAdded_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.deviceInfo = decoder.decodeStructPointer(device$.UsbDeviceInfo);
-    return val;
-  };
-
-  UsbDeviceManagerClient_OnDeviceAdded_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDeviceManagerClient_OnDeviceAdded_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStructPointer(device$.UsbDeviceInfo, val.deviceInfo);
-  };
-  function UsbDeviceManagerClient_OnDeviceRemoved_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  UsbDeviceManagerClient_OnDeviceRemoved_Params.prototype.initDefaults_ = function() {
-    this.deviceInfo = null;
-  };
-  UsbDeviceManagerClient_OnDeviceRemoved_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  UsbDeviceManagerClient_OnDeviceRemoved_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate UsbDeviceManagerClient_OnDeviceRemoved_Params.deviceInfo
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, device$.UsbDeviceInfo, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  UsbDeviceManagerClient_OnDeviceRemoved_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  UsbDeviceManagerClient_OnDeviceRemoved_Params.decode = function(decoder) {
-    var packed;
-    var val = new UsbDeviceManagerClient_OnDeviceRemoved_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.deviceInfo = decoder.decodeStructPointer(device$.UsbDeviceInfo);
-    return val;
-  };
-
-  UsbDeviceManagerClient_OnDeviceRemoved_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(UsbDeviceManagerClient_OnDeviceRemoved_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStructPointer(device$.UsbDeviceInfo, val.deviceInfo);
-  };
-  var kUsbDeviceManagerClient_OnDeviceAdded_Name = 0;
-  var kUsbDeviceManagerClient_OnDeviceRemoved_Name = 1;
-
-  function UsbDeviceManagerClientPtr(handleOrPtrInfo) {
-    this.ptr = new bindings.InterfacePtrController(UsbDeviceManagerClient,
-                                                   handleOrPtrInfo);
-  }
-
-  function UsbDeviceManagerClientAssociatedPtr(associatedInterfacePtrInfo) {
-    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
-        UsbDeviceManagerClient, associatedInterfacePtrInfo);
-  }
-
-  UsbDeviceManagerClientAssociatedPtr.prototype =
-      Object.create(UsbDeviceManagerClientPtr.prototype);
-  UsbDeviceManagerClientAssociatedPtr.prototype.constructor =
-      UsbDeviceManagerClientAssociatedPtr;
-
-  function UsbDeviceManagerClientProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-  UsbDeviceManagerClientPtr.prototype.onDeviceAdded = function() {
-    return UsbDeviceManagerClientProxy.prototype.onDeviceAdded
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceManagerClientProxy.prototype.onDeviceAdded = function(deviceInfo) {
-    var params_ = new UsbDeviceManagerClient_OnDeviceAdded_Params();
-    params_.deviceInfo = deviceInfo;
-    var builder = new codec.MessageV0Builder(
-        kUsbDeviceManagerClient_OnDeviceAdded_Name,
-        codec.align(UsbDeviceManagerClient_OnDeviceAdded_Params.encodedSize));
-    builder.encodeStruct(UsbDeviceManagerClient_OnDeviceAdded_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-  UsbDeviceManagerClientPtr.prototype.onDeviceRemoved = function() {
-    return UsbDeviceManagerClientProxy.prototype.onDeviceRemoved
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  UsbDeviceManagerClientProxy.prototype.onDeviceRemoved = function(deviceInfo) {
-    var params_ = new UsbDeviceManagerClient_OnDeviceRemoved_Params();
-    params_.deviceInfo = deviceInfo;
-    var builder = new codec.MessageV0Builder(
-        kUsbDeviceManagerClient_OnDeviceRemoved_Name,
-        codec.align(UsbDeviceManagerClient_OnDeviceRemoved_Params.encodedSize));
-    builder.encodeStruct(UsbDeviceManagerClient_OnDeviceRemoved_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-
-  function UsbDeviceManagerClientStub(delegate) {
-    this.delegate_ = delegate;
-  }
-  UsbDeviceManagerClientStub.prototype.onDeviceAdded = function(deviceInfo) {
-    return this.delegate_ && this.delegate_.onDeviceAdded && this.delegate_.onDeviceAdded(deviceInfo);
-  }
-  UsbDeviceManagerClientStub.prototype.onDeviceRemoved = function(deviceInfo) {
-    return this.delegate_ && this.delegate_.onDeviceRemoved && this.delegate_.onDeviceRemoved(deviceInfo);
-  }
-
-  UsbDeviceManagerClientStub.prototype.accept = function(message) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kUsbDeviceManagerClient_OnDeviceAdded_Name:
-      var params = reader.decodeStruct(UsbDeviceManagerClient_OnDeviceAdded_Params);
-      this.onDeviceAdded(params.deviceInfo);
-      return true;
-    case kUsbDeviceManagerClient_OnDeviceRemoved_Name:
-      var params = reader.decodeStruct(UsbDeviceManagerClient_OnDeviceRemoved_Params);
-      this.onDeviceRemoved(params.deviceInfo);
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  UsbDeviceManagerClientStub.prototype.acceptWithResponder =
-      function(message, responder) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    default:
-      return false;
-    }
-  };
-
-  function validateUsbDeviceManagerClientRequest(messageValidator) {
-    var message = messageValidator.message;
-    var paramsClass = null;
-    switch (message.getName()) {
-      case kUsbDeviceManagerClient_OnDeviceAdded_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = UsbDeviceManagerClient_OnDeviceAdded_Params;
-      break;
-      case kUsbDeviceManagerClient_OnDeviceRemoved_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = UsbDeviceManagerClient_OnDeviceRemoved_Params;
-      break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  function validateUsbDeviceManagerClientResponse(messageValidator) {
-    return validator.validationError.NONE;
-  }
-
-  var UsbDeviceManagerClient = {
-    name: 'device.mojom.UsbDeviceManagerClient',
-    kVersion: 0,
-    ptrClass: UsbDeviceManagerClientPtr,
-    proxyClass: UsbDeviceManagerClientProxy,
-    stubClass: UsbDeviceManagerClientStub,
-    validateRequest: validateUsbDeviceManagerClientRequest,
-    validateResponse: null,
-  };
-  UsbDeviceManagerClientStub.prototype.validator = validateUsbDeviceManagerClientRequest;
-  UsbDeviceManagerClientProxy.prototype.validator = null;
-  exports.UsbDeviceManagerClient = UsbDeviceManagerClient;
-  exports.UsbDeviceManagerClientPtr = UsbDeviceManagerClientPtr;
-  exports.UsbDeviceManagerClientAssociatedPtr = UsbDeviceManagerClientAssociatedPtr;
-})();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/device_manager_client.mojom.js.headers b/tests/wpt/web-platform-tests/resources/chromium/device_manager_client.mojom.js.headers
deleted file mode 100644
index 6c61a34a4ec..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/device_manager_client.mojom.js.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript; charset=utf-8
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/string16.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/string16.mojom.js
deleted file mode 100644
index 25377e66571..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/string16.mojom.js
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'mojo/public/mojom/base/string16.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('mojoBase.mojom');
-  var big_buffer$ =
-      mojo.internal.exposeNamespace('mojoBase.mojom');
-  if (mojo.config.autoLoadMojomDeps) {
-    mojo.internal.loadMojomIfNecessary(
-        'mojo/public/mojom/base/big_buffer.mojom', 'big_buffer.mojom.js');
-  }
-
-
-
-  function String16(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  String16.prototype.initDefaults_ = function() {
-    this.data = null;
-  };
-  String16.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  String16.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate String16.data
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 0, 2, codec.Uint16, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  String16.encodedSize = codec.kStructHeaderSize + 8;
-
-  String16.decode = function(decoder) {
-    var packed;
-    var val = new String16();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.data = decoder.decodeArrayPointer(codec.Uint16);
-    return val;
-  };
-
-  String16.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(String16.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeArrayPointer(codec.Uint16, val.data);
-  };
-  function BigString16(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  BigString16.prototype.initDefaults_ = function() {
-    this.data = null;
-  };
-  BigString16.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  BigString16.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate BigString16.data
-    err = messageValidator.validateUnion(offset + codec.kStructHeaderSize + 0, big_buffer$.BigBuffer, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  BigString16.encodedSize = codec.kStructHeaderSize + 16;
-
-  BigString16.decode = function(decoder) {
-    var packed;
-    var val = new BigString16();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.data = decoder.decodeStruct(big_buffer$.BigBuffer);
-    return val;
-  };
-
-  BigString16.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(BigString16.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(big_buffer$.BigBuffer, val.data);
-  };
-  exports.String16 = String16;
-  exports.BigString16 = BigString16;
-})();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/string16.mojom.js.headers b/tests/wpt/web-platform-tests/resources/chromium/string16.mojom.js.headers
deleted file mode 100644
index 6805c323df5..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/string16.mojom.js.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript; charset=utf-8
diff --git a/tests/wpt/web-platform-tests/resources/chromium/url.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/url.mojom.js
deleted file mode 100644
index c5eee1f2aeb..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/url.mojom.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'url/mojom/url.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('url.mojom');
-
-
-
-  function Url(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Url.prototype.initDefaults_ = function() {
-    this.url = null;
-  };
-  Url.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Url.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate Url.url
-    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  Url.encodedSize = codec.kStructHeaderSize + 8;
-
-  Url.decode = function(decoder) {
-    var packed;
-    var val = new Url();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.url = decoder.decodeStruct(codec.String);
-    return val;
-  };
-
-  Url.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Url.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.String, val.url);
-  };
-  exports.Url = Url;
-})();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/web_usb_service.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/web_usb_service.mojom.js
deleted file mode 100644
index a4a017b1de1..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/web_usb_service.mojom.js
+++ /dev/null
@@ -1,614 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'third_party/blink/public/mojom/usb/web_usb_service.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('blink.mojom');
-  var device$ =
-      mojo.internal.exposeNamespace('device.mojom');
-  if (mojo.config.autoLoadMojomDeps) {
-    mojo.internal.loadMojomIfNecessary(
-        'device/usb/public/mojom/device.mojom', '../../../../../device/usb/public/mojom/device.mojom.js');
-  }
-  var device_enumeration_options$ =
-      mojo.internal.exposeNamespace('device.mojom');
-  if (mojo.config.autoLoadMojomDeps) {
-    mojo.internal.loadMojomIfNecessary(
-        'device/usb/public/mojom/device_enumeration_options.mojom', '../../../../../device/usb/public/mojom/device_enumeration_options.mojom.js');
-  }
-  var device_manager_client$ =
-      mojo.internal.exposeNamespace('device.mojom');
-  if (mojo.config.autoLoadMojomDeps) {
-    mojo.internal.loadMojomIfNecessary(
-        'device/usb/public/mojom/device_manager_client.mojom', '../../../../../device/usb/public/mojom/device_manager_client.mojom.js');
-  }
-
-
-
-  function WebUsbService_GetDevices_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  WebUsbService_GetDevices_Params.prototype.initDefaults_ = function() {
-  };
-  WebUsbService_GetDevices_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  WebUsbService_GetDevices_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  WebUsbService_GetDevices_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  WebUsbService_GetDevices_Params.decode = function(decoder) {
-    var packed;
-    var val = new WebUsbService_GetDevices_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  WebUsbService_GetDevices_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(WebUsbService_GetDevices_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function WebUsbService_GetDevices_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  WebUsbService_GetDevices_ResponseParams.prototype.initDefaults_ = function() {
-    this.results = null;
-  };
-  WebUsbService_GetDevices_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  WebUsbService_GetDevices_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate WebUsbService_GetDevices_ResponseParams.results
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 0, 8, new codec.PointerTo(device$.UsbDeviceInfo), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  WebUsbService_GetDevices_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  WebUsbService_GetDevices_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new WebUsbService_GetDevices_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.results = decoder.decodeArrayPointer(new codec.PointerTo(device$.UsbDeviceInfo));
-    return val;
-  };
-
-  WebUsbService_GetDevices_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(WebUsbService_GetDevices_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeArrayPointer(new codec.PointerTo(device$.UsbDeviceInfo), val.results);
-  };
-  function WebUsbService_GetDevice_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  WebUsbService_GetDevice_Params.prototype.initDefaults_ = function() {
-    this.guid = null;
-    this.deviceRequestd = new bindings.InterfaceRequest();
-  };
-  WebUsbService_GetDevice_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  WebUsbService_GetDevice_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate WebUsbService_GetDevice_Params.guid
-    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate WebUsbService_GetDevice_Params.deviceRequestd
-    err = messageValidator.validateInterfaceRequest(offset + codec.kStructHeaderSize + 8, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  WebUsbService_GetDevice_Params.encodedSize = codec.kStructHeaderSize + 16;
-
-  WebUsbService_GetDevice_Params.decode = function(decoder) {
-    var packed;
-    var val = new WebUsbService_GetDevice_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.guid = decoder.decodeStruct(codec.String);
-    val.deviceRequestd = decoder.decodeStruct(codec.InterfaceRequest);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  WebUsbService_GetDevice_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(WebUsbService_GetDevice_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.String, val.guid);
-    encoder.encodeStruct(codec.InterfaceRequest, val.deviceRequestd);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function WebUsbService_GetPermission_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  WebUsbService_GetPermission_Params.prototype.initDefaults_ = function() {
-    this.deviceFilters = null;
-  };
-  WebUsbService_GetPermission_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  WebUsbService_GetPermission_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate WebUsbService_GetPermission_Params.deviceFilters
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 0, 8, new codec.PointerTo(device_enumeration_options$.UsbDeviceFilter), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  WebUsbService_GetPermission_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  WebUsbService_GetPermission_Params.decode = function(decoder) {
-    var packed;
-    var val = new WebUsbService_GetPermission_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.deviceFilters = decoder.decodeArrayPointer(new codec.PointerTo(device_enumeration_options$.UsbDeviceFilter));
-    return val;
-  };
-
-  WebUsbService_GetPermission_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(WebUsbService_GetPermission_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeArrayPointer(new codec.PointerTo(device_enumeration_options$.UsbDeviceFilter), val.deviceFilters);
-  };
-  function WebUsbService_GetPermission_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  WebUsbService_GetPermission_ResponseParams.prototype.initDefaults_ = function() {
-    this.result = null;
-  };
-  WebUsbService_GetPermission_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  WebUsbService_GetPermission_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate WebUsbService_GetPermission_ResponseParams.result
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, device$.UsbDeviceInfo, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  WebUsbService_GetPermission_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  WebUsbService_GetPermission_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new WebUsbService_GetPermission_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.result = decoder.decodeStructPointer(device$.UsbDeviceInfo);
-    return val;
-  };
-
-  WebUsbService_GetPermission_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(WebUsbService_GetPermission_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStructPointer(device$.UsbDeviceInfo, val.result);
-  };
-  function WebUsbService_SetClient_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  WebUsbService_SetClient_Params.prototype.initDefaults_ = function() {
-    this.client = new associatedBindings.AssociatedInterfacePtrInfo();
-  };
-  WebUsbService_SetClient_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  WebUsbService_SetClient_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate WebUsbService_SetClient_Params.client
-    err = messageValidator.validateAssociatedInterface(offset + codec.kStructHeaderSize + 0, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  WebUsbService_SetClient_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  WebUsbService_SetClient_Params.decode = function(decoder) {
-    var packed;
-    var val = new WebUsbService_SetClient_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.client = decoder.decodeStruct(codec.AssociatedInterfacePtrInfo);
-    return val;
-  };
-
-  WebUsbService_SetClient_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(WebUsbService_SetClient_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.AssociatedInterfacePtrInfo, val.client);
-  };
-  var kWebUsbService_GetDevices_Name = 0;
-  var kWebUsbService_GetDevice_Name = 1;
-  var kWebUsbService_GetPermission_Name = 2;
-  var kWebUsbService_SetClient_Name = 3;
-
-  function WebUsbServicePtr(handleOrPtrInfo) {
-    this.ptr = new bindings.InterfacePtrController(WebUsbService,
-                                                   handleOrPtrInfo);
-  }
-
-  function WebUsbServiceAssociatedPtr(associatedInterfacePtrInfo) {
-    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
-        WebUsbService, associatedInterfacePtrInfo);
-  }
-
-  WebUsbServiceAssociatedPtr.prototype =
-      Object.create(WebUsbServicePtr.prototype);
-  WebUsbServiceAssociatedPtr.prototype.constructor =
-      WebUsbServiceAssociatedPtr;
-
-  function WebUsbServiceProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-  WebUsbServicePtr.prototype.getDevices = function() {
-    return WebUsbServiceProxy.prototype.getDevices
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  WebUsbServiceProxy.prototype.getDevices = function() {
-    var params_ = new WebUsbService_GetDevices_Params();
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kWebUsbService_GetDevices_Name,
-          codec.align(WebUsbService_GetDevices_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(WebUsbService_GetDevices_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(WebUsbService_GetDevices_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  WebUsbServicePtr.prototype.getDevice = function() {
-    return WebUsbServiceProxy.prototype.getDevice
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  WebUsbServiceProxy.prototype.getDevice = function(guid, deviceRequestd) {
-    var params_ = new WebUsbService_GetDevice_Params();
-    params_.guid = guid;
-    params_.deviceRequestd = deviceRequestd;
-    var builder = new codec.MessageV0Builder(
-        kWebUsbService_GetDevice_Name,
-        codec.align(WebUsbService_GetDevice_Params.encodedSize));
-    builder.encodeStruct(WebUsbService_GetDevice_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-  WebUsbServicePtr.prototype.getPermission = function() {
-    return WebUsbServiceProxy.prototype.getPermission
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  WebUsbServiceProxy.prototype.getPermission = function(deviceFilters) {
-    var params_ = new WebUsbService_GetPermission_Params();
-    params_.deviceFilters = deviceFilters;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kWebUsbService_GetPermission_Name,
-          codec.align(WebUsbService_GetPermission_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(WebUsbService_GetPermission_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(WebUsbService_GetPermission_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  WebUsbServicePtr.prototype.setClient = function() {
-    return WebUsbServiceProxy.prototype.setClient
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  WebUsbServiceProxy.prototype.setClient = function(client) {
-    var params_ = new WebUsbService_SetClient_Params();
-    params_.client = client;
-    var builder = new codec.MessageV2Builder(
-        kWebUsbService_SetClient_Name,
-        codec.align(WebUsbService_SetClient_Params.encodedSize));
-    builder.setPayload(WebUsbService_SetClient_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-
-  function WebUsbServiceStub(delegate) {
-    this.delegate_ = delegate;
-  }
-  WebUsbServiceStub.prototype.getDevices = function() {
-    return this.delegate_ && this.delegate_.getDevices && this.delegate_.getDevices();
-  }
-  WebUsbServiceStub.prototype.getDevice = function(guid, deviceRequestd) {
-    return this.delegate_ && this.delegate_.getDevice && this.delegate_.getDevice(guid, deviceRequestd);
-  }
-  WebUsbServiceStub.prototype.getPermission = function(deviceFilters) {
-    return this.delegate_ && this.delegate_.getPermission && this.delegate_.getPermission(deviceFilters);
-  }
-  WebUsbServiceStub.prototype.setClient = function(client) {
-    return this.delegate_ && this.delegate_.setClient && this.delegate_.setClient(client);
-  }
-
-  WebUsbServiceStub.prototype.accept = function(message) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kWebUsbService_GetDevice_Name:
-      var params = reader.decodeStruct(WebUsbService_GetDevice_Params);
-      this.getDevice(params.guid, params.deviceRequestd);
-      return true;
-    case kWebUsbService_SetClient_Name:
-      var params = reader.decodeStruct(WebUsbService_SetClient_Params);
-      this.setClient(params.client);
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  WebUsbServiceStub.prototype.acceptWithResponder =
-      function(message, responder) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kWebUsbService_GetDevices_Name:
-      var params = reader.decodeStruct(WebUsbService_GetDevices_Params);
-      this.getDevices().then(function(response) {
-        var responseParams =
-            new WebUsbService_GetDevices_ResponseParams();
-        responseParams.results = response.results;
-        var builder = new codec.MessageV1Builder(
-            kWebUsbService_GetDevices_Name,
-            codec.align(WebUsbService_GetDevices_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(WebUsbService_GetDevices_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kWebUsbService_GetPermission_Name:
-      var params = reader.decodeStruct(WebUsbService_GetPermission_Params);
-      this.getPermission(params.deviceFilters).then(function(response) {
-        var responseParams =
-            new WebUsbService_GetPermission_ResponseParams();
-        responseParams.result = response.result;
-        var builder = new codec.MessageV1Builder(
-            kWebUsbService_GetPermission_Name,
-            codec.align(WebUsbService_GetPermission_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(WebUsbService_GetPermission_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  function validateWebUsbServiceRequest(messageValidator) {
-    var message = messageValidator.message;
-    var paramsClass = null;
-    switch (message.getName()) {
-      case kWebUsbService_GetDevices_Name:
-        if (message.expectsResponse())
-          paramsClass = WebUsbService_GetDevices_Params;
-      break;
-      case kWebUsbService_GetDevice_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = WebUsbService_GetDevice_Params;
-      break;
-      case kWebUsbService_GetPermission_Name:
-        if (message.expectsResponse())
-          paramsClass = WebUsbService_GetPermission_Params;
-      break;
-      case kWebUsbService_SetClient_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = WebUsbService_SetClient_Params;
-      break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  function validateWebUsbServiceResponse(messageValidator) {
-   var message = messageValidator.message;
-   var paramsClass = null;
-   switch (message.getName()) {
-      case kWebUsbService_GetDevices_Name:
-        if (message.isResponse())
-          paramsClass = WebUsbService_GetDevices_ResponseParams;
-        break;
-      case kWebUsbService_GetPermission_Name:
-        if (message.isResponse())
-          paramsClass = WebUsbService_GetPermission_ResponseParams;
-        break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  var WebUsbService = {
-    name: 'blink.mojom.WebUsbService',
-    kVersion: 0,
-    ptrClass: WebUsbServicePtr,
-    proxyClass: WebUsbServiceProxy,
-    stubClass: WebUsbServiceStub,
-    validateRequest: validateWebUsbServiceRequest,
-    validateResponse: validateWebUsbServiceResponse,
-  };
-  WebUsbServiceStub.prototype.validator = validateWebUsbServiceRequest;
-  WebUsbServiceProxy.prototype.validator = validateWebUsbServiceResponse;
-  exports.WebUsbService = WebUsbService;
-  exports.WebUsbServicePtr = WebUsbServicePtr;
-  exports.WebUsbServiceAssociatedPtr = WebUsbServiceAssociatedPtr;
-})();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/web_usb_service.mojom.js.headers b/tests/wpt/web-platform-tests/resources/chromium/web_usb_service.mojom.js.headers
deleted file mode 100644
index 6805c323df5..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/web_usb_service.mojom.js.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript; charset=utf-8
diff --git a/tests/wpt/web-platform-tests/resources/test-only-api.js b/tests/wpt/web-platform-tests/resources/test-only-api.js
index 53891d21bd4..ae3137481da 100644
--- a/tests/wpt/web-platform-tests/resources/test-only-api.js
+++ b/tests/wpt/web-platform-tests/resources/test-only-api.js
@@ -23,7 +23,7 @@ function loadScript(path) {
     script.async = false;
     const p = new Promise((resolve, reject) => {
       script.onload = () => { resolve(); };
-      script.onerror = e => { reject(e); };
+      script.onerror = e => { reject(`Error loading ${path}`); };
     })
     document.head.appendChild(script);
     return p;
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html
new file mode 100644
index 00000000000..72feec8a408
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<title>Navigating to a text fragment anchor</title>
+<script src="stash.js"></script>
+<script src="force-load-at-top.js"></script>
+<style>
+  p#target {
+    margin: 2000px 0px 2000px 0px;
+  }
+</style>
+<!-- This page is loaded with the force-load-at-top Document-Policy header -->
+<body>
+  <p>Top of page</p>
+  <p id="target">target</p>
+  <p id="history">history</p>
+</body>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html.headers b/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html.headers
new file mode 100644
index 00000000000..33dcdbb01ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html.headers
@@ -0,0 +1 @@
+Document-Policy: force-load-at-top
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.html
new file mode 100644
index 00000000000..1399de3d624
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.html
@@ -0,0 +1,60 @@
+<!doctype html>
+<title>ForceLoadAtTop blocks scroll on load</title>
+<meta charset=utf-8>
+<link rel="help" href="https://wicg.github.io/ScrollToTextFragment/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/utils.js"></script>
+<script src="stash.js"></script>
+
+<!--See comment in scroll-to-text-fragment.html for why this test has the
+structure it has -->
+<script>
+
+let test_cases = [
+  {
+    fragment: '#:~:text=target',
+    type: 'text fragment'
+  },
+  {
+    fragment: '#target:~:text=target',
+    type: 'text fragment with element fallback'
+  },
+  {
+    fragment: '#target',
+    type: 'element fragment'
+  },
+  {
+    fragment: '#history',
+    type: 'history scroll restoration'
+  },
+];
+
+let document_policy_value = [
+  'force-load-at-top',
+  'no-force-load-at-top'
+];
+
+for (const value of document_policy_value) {
+  // If no-force-load-at-top is specified we expect to allow scrolling,
+  // otherwise scroll on load should be blocked.
+  const scroll_expected = value == 'no-force-load-at-top';
+  const block_verb = scroll_expected ? "must not" : "must";
+
+  for (const test_case of test_cases) {
+    promise_test(t => new Promise((resolve, reject) => {
+      let key = token();
+
+      test_driver.bless('Open a URL with a text fragment directive', () => {
+        window.open(`${value}-target.html?key=${key}${test_case.fragment}`, '_blank', 'noopener');
+      });
+
+      fetchResults(key, resolve, reject);
+    }).then(data => {
+      assert_equals(data.scrolled, scroll_expected);
+    }), `${value} ${block_verb} block scroll on load from ${test_case.type}.`);
+  }
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.js b/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.js
new file mode 100644
index 00000000000..223e3a4b5a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.js
@@ -0,0 +1,33 @@
+function checkScroll() {
+  // Ensure two animation frames on load to test the fallback to element
+  // anchor, which gets queued for the next frame if the text fragment is not
+  // found.
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      let results = {
+        scrolled: (window.pageYOffset != 0),
+      };
+
+      let key = (new URL(document.location)).searchParams.get("key");
+      stashResultsThenClose(key, results);
+    });
+  });
+}
+
+window.addEventListener('load', () => {
+  if (location.hash == "#history") {
+    // This is the "history" test - on the first load we'll navigate to a page
+    // that calls history.back(). When we load a second time (from the back
+    // navigation), record the scroll state at that point to check how history
+    // scroll restoration is handled.
+    if (history.state == null) {
+      history.pushState("test", "test", "");
+      requestAnimationFrame(() => {
+        location.href = "navigate-back.html";
+      });
+      return;
+    }
+  }
+
+  checkScroll();
+});
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/navigate-back.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/navigate-back.html
new file mode 100644
index 00000000000..4b4117fcc57
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/navigate-back.html
@@ -0,0 +1,8 @@
+<!doctype html>
+<script>
+  onload = () => {
+    requestAnimationFrame(() => {
+      history.back();
+    });
+  };
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html
new file mode 100644
index 00000000000..57e5f6d32ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<title>Navigating to a text fragment anchor</title>
+<script src="stash.js"></script>
+<script src="force-load-at-top.js"></script>
+<style>
+  p#target {
+    margin: 2000px 0px 2000px 0px;
+  }
+</style>
+<!-- This page is loaded with the no-force-load-at-top Document-Policy header -->
+<body>
+  <p>Top of page</p>
+  <p id="target">target</p>
+  <p id="history">history</p>
+</body>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html.headers b/tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html.headers
new file mode 100644
index 00000000000..3a2c029fd6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html.headers
@@ -0,0 +1 @@
+Document-Policy: no-force-load-at-top
diff --git a/tests/wpt/web-platform-tests/trusted-types/support/set-inner-html.js b/tests/wpt/web-platform-tests/trusted-types/support/set-inner-html.js
new file mode 100644
index 00000000000..45053d43e36
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/support/set-inner-html.js
@@ -0,0 +1,3 @@
+function setInnerHtml(element, value) {
+  element.innerHTML = value;
+}
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-source-file-path.tentative.html b/tests/wpt/web-platform-tests/trusted-types/trusted-types-source-file-path.tentative.html
new file mode 100644
index 00000000000..61adb299343
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-source-file-path.tentative.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<head>
+  <title>
+    Check the reported TrustedType violation's sourceFile.
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/get-host-info.sub.js"></script>
+  <meta http-equiv="Content-Security-Policy"
+        content="require-trusted-types-for 'script'; trusted-types id">
+  </head>
+<body>
+
+<script id="to-be-modified"></script>
+<script>
+let toBeModified = document.querySelector("#to-be-modified");
+
+let id_policy = trustedTypes.createPolicy("id", {
+  createHTML: x => x,
+  createScriptURL: x => x,
+  createScript: x => x,
+});
+
+function futureViolation() {
+  return new Promise(r => addEventListener("securitypolicyviolation", r), {
+    once: true
+  });
+}
+
+function futureScript(url) {
+  return new Promise(r => {
+    let script = document.createElement("script");
+    script.src = id_policy.createScriptURL(url);
+    script.onload = r;
+    document.body.appendChild(script);
+  });
+}
+
+promise_test(async t => {
+  let future_violation = futureViolation();
+  assert_throws_js(TypeError, () => {
+    document.getElementById("to-be-modified").innerHTML = "'test'";
+  });
+  let violation = await future_violation;
+  assert_equals(violation.sourceFile, location.href)
+}, "same-document script")
+
+promise_test(async t => {
+  let script_origin = get_host_info().HTTP_ORIGIN;
+  let script_src = script_origin +
+    "/trusted-types/support/set-inner-html.js";
+  let script = await futureScript(script_src);
+  let future_violation = futureViolation();
+  assert_throws_js(TypeError, () => setInnerHtml(toBeModified, "'test'"));
+  let violation = await future_violation;
+  assert_equals(violation.sourceFile, script_src);
+}, "same-origin script")
+
+promise_test(async t => {
+  let script_origin = get_host_info().HTTP_REMOTE_ORIGIN;
+  let script_src = script_origin +
+    "/trusted-types/support/set-inner-html.js";
+  let script = await futureScript(script_src);
+  let future_violation = futureViolation();
+  assert_throws_js(TypeError, () => setInnerHtml(toBeModified, "'test'"));
+  let violation = await future_violation;
+  // TODO(https://crbug.com/1113163): Consider exposing the full path of the
+  // cross-origin script here instead of just its origin.
+  assert_equals(violation.sourceFile, script_origin);
+}, "cross-origin script")
+
+// TODO(arthursonzogni): Check what happens with redirects. Do we report the
+// request's URL or the response's URL?
+
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/webusb/idlharness.https.any.js b/tests/wpt/web-platform-tests/webusb/idlharness.https.any.js
index 04cbf708267..0c8cb322a08 100644
--- a/tests/wpt/web-platform-tests/webusb/idlharness.https.any.js
+++ b/tests/wpt/web-platform-tests/webusb/idlharness.https.any.js
@@ -1,6 +1,7 @@
 // META: timeout=long
 // META: script=/resources/WebIDLParser.js
 // META: script=/resources/idlharness.js
+// META: script=/resources/test-only-api.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
 
diff --git a/tests/wpt/web-platform-tests/webusb/resources/open-in-iframe.html b/tests/wpt/web-platform-tests/webusb/resources/open-in-iframe.html
index ec80bff3c23..730db249029 100644
--- a/tests/wpt/web-platform-tests/webusb/resources/open-in-iframe.html
+++ b/tests/wpt/web-platform-tests/webusb/resources/open-in-iframe.html
@@ -1,4 +1,6 @@
 <!DOCTYPE html>
+<!-- Intentionally use relative paths here because this file is also used by blink/web_tests/usb/usbDevice-iframe.html. -->
+<script src="../../resources/test-only-api.js"></script>
 <script src="usb-helpers.js"></script>
 <script>
 'use strict';
diff --git a/tests/wpt/web-platform-tests/webusb/resources/open-in-worker.js b/tests/wpt/web-platform-tests/webusb/resources/open-in-worker.js
index b715184e04d..e16621057a0 100644
--- a/tests/wpt/web-platform-tests/webusb/resources/open-in-worker.js
+++ b/tests/wpt/web-platform-tests/webusb/resources/open-in-worker.js
@@ -1,3 +1,4 @@
+importScripts('/resources/test-only-api.js');
 importScripts('/webusb/resources/usb-helpers.js');
 'use strict';
 
@@ -12,4 +13,4 @@ onmessage = messageEvent => {
     });
     postMessage({ type: 'Ready' });
   }
-};
\ No newline at end of file
+};
diff --git a/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js b/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js
index 67d907d2c2f..b41c054c716 100644
--- a/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js
+++ b/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js
@@ -11,68 +11,36 @@
 
 (() => {
   // Load scripts needed by the test API on context creation.
-  if ('MojoInterfaceInterceptor' in self) {
-    let prefix = '/resources/chromium';
-    if ('window' in self) {
-      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`;
-      }
-    }
-    let scriptPath = `${prefix}/webusb-child-test.js`;
-    if (typeof document == 'undefined') {
-      importScripts(scriptPath);
-    } else {
-      let script = document.createElement('script');
-      script.src = scriptPath;
-      script.async = false;
-      document.head.appendChild(script);
-    }
+  if (isChromiumBased) {
+    loadScript('/resources/chromium/webusb-child-test.js');
   }
 })();
 
-let loadChromiumResources = Promise.resolve().then(() => {
-  if (!('MojoInterfaceInterceptor' in self)) {
-    // 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/big_buffer.mojom.js',
-    '/resources/chromium/string16.mojom.js',
-    '/resources/chromium/url.mojom.js',
-    '/resources/chromium/device.mojom.js',
-    '/resources/chromium/device_enumeration_options.mojom.js',
-    '/resources/chromium/device_manager_client.mojom.js',
-    '/resources/chromium/web_usb_service.mojom.js',
-    '/resources/chromium/webusb-test.js',
-  ].forEach(path => {
-    // Use importScripts for workers.
-    if (typeof document === 'undefined') {
-      chain = chain.then(() => importScripts(path));
-      return;
-    }
-    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;
-});
+// 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 () => {
     if (navigator.usb.test === undefined) {
       // Try loading a polyfill for the WebUSB Testing API.
-      await loadChromiumResources;
+      if (isChromiumBased) {
+        await loadChromiumResources();
+        await loadScript('/resources/chromium/webusb-test.js');
+      } else {
+        assert_implements(false, "missing navigator.usb.test");
+      }
     }
 
     await navigator.usb.test.initialize();
diff --git a/tests/wpt/web-platform-tests/webusb/usb.https.any.js b/tests/wpt/web-platform-tests/webusb/usb.https.any.js
index 109c82a4156..c9a95b10ad1 100644
--- a/tests/wpt/web-platform-tests/webusb/usb.https.any.js
+++ b/tests/wpt/web-platform-tests/webusb/usb.https.any.js
@@ -1,3 +1,4 @@
+// META: script=/resources/test-only-api.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
 'use strict';
diff --git a/tests/wpt/web-platform-tests/webusb/usb.https.window.js b/tests/wpt/web-platform-tests/webusb/usb.https.window.js
index 8c9e676cdfc..690faf3e92d 100644
--- a/tests/wpt/web-platform-tests/webusb/usb.https.window.js
+++ b/tests/wpt/web-platform-tests/webusb/usb.https.window.js
@@ -1,5 +1,6 @@
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
+// META: script=/resources/test-only-api.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
 'use strict';
diff --git a/tests/wpt/web-platform-tests/webusb/usbAlternateInterface.https.any.js b/tests/wpt/web-platform-tests/webusb/usbAlternateInterface.https.any.js
index e5ef3844ae4..e97d53c16dd 100644
--- a/tests/wpt/web-platform-tests/webusb/usbAlternateInterface.https.any.js
+++ b/tests/wpt/web-platform-tests/webusb/usbAlternateInterface.https.any.js
@@ -1,3 +1,4 @@
+// META: script=/resources/test-only-api.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
 'use strict';
diff --git a/tests/wpt/web-platform-tests/webusb/usbConfiguration.https.any.js b/tests/wpt/web-platform-tests/webusb/usbConfiguration.https.any.js
index e7d1c7fb146..96aaee273da 100644
--- a/tests/wpt/web-platform-tests/webusb/usbConfiguration.https.any.js
+++ b/tests/wpt/web-platform-tests/webusb/usbConfiguration.https.any.js
@@ -1,3 +1,4 @@
+// META: script=/resources/test-only-api.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
 'use strict';
diff --git a/tests/wpt/web-platform-tests/webusb/usbConnectionEvent.https.any.js b/tests/wpt/web-platform-tests/webusb/usbConnectionEvent.https.any.js
index 349fd9b75f3..12ede9e6c6a 100644
--- a/tests/wpt/web-platform-tests/webusb/usbConnectionEvent.https.any.js
+++ b/tests/wpt/web-platform-tests/webusb/usbConnectionEvent.https.any.js
@@ -1,3 +1,4 @@
+// META: script=/resources/test-only-api.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
 
diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice-iframe.https.html b/tests/wpt/web-platform-tests/webusb/usbDevice-iframe.https.html
index 75bad9e0c9f..5a6dd0565f5 100644
--- a/tests/wpt/web-platform-tests/webusb/usbDevice-iframe.https.html
+++ b/tests/wpt/web-platform-tests/webusb/usbDevice-iframe.https.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/test-only-api.js"></script>
 <script src="resources/fake-devices.js"></script>
 <script src="resources/usb-helpers.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice-worker.https.html b/tests/wpt/web-platform-tests/webusb/usbDevice-worker.https.html
index 119f5d66882..dcad6ec08ea 100644
--- a/tests/wpt/web-platform-tests/webusb/usbDevice-worker.https.html
+++ b/tests/wpt/web-platform-tests/webusb/usbDevice-worker.https.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/test-only-api.js"></script>
 <script src="/webusb/resources/fake-devices.js"></script>
 <script src="/webusb/resources/usb-helpers.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice.https.any.js b/tests/wpt/web-platform-tests/webusb/usbDevice.https.any.js
index b41687079e5..5bfd841d524 100644
--- a/tests/wpt/web-platform-tests/webusb/usbDevice.https.any.js
+++ b/tests/wpt/web-platform-tests/webusb/usbDevice.https.any.js
@@ -1,4 +1,5 @@
 // META: timeout=long
+// META: script=/resources/test-only-api.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
 'use strict';
diff --git a/tests/wpt/web-platform-tests/webusb/usbEndpoint.https.any.js b/tests/wpt/web-platform-tests/webusb/usbEndpoint.https.any.js
index e57639c3d4b..c987e4c3335 100644
--- a/tests/wpt/web-platform-tests/webusb/usbEndpoint.https.any.js
+++ b/tests/wpt/web-platform-tests/webusb/usbEndpoint.https.any.js
@@ -1,3 +1,4 @@
+// META: script=/resources/test-only-api.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
 'use strict';
diff --git a/tests/wpt/web-platform-tests/webusb/usbInTransferResult.https.any.js b/tests/wpt/web-platform-tests/webusb/usbInTransferResult.https.any.js
index c8f65f1737a..dcfa38124a6 100644
--- a/tests/wpt/web-platform-tests/webusb/usbInTransferResult.https.any.js
+++ b/tests/wpt/web-platform-tests/webusb/usbInTransferResult.https.any.js
@@ -1,3 +1,4 @@
+// META: script=/resources/test-only-api.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
 'use strict';
diff --git a/tests/wpt/web-platform-tests/webusb/usbInterface.https.any.js b/tests/wpt/web-platform-tests/webusb/usbInterface.https.any.js
index 7fbf660bbce..8e99c6f83f4 100644
--- a/tests/wpt/web-platform-tests/webusb/usbInterface.https.any.js
+++ b/tests/wpt/web-platform-tests/webusb/usbInterface.https.any.js
@@ -1,3 +1,4 @@
+// META: script=/resources/test-only-api.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
 'use strict';
diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_source_cancel.https.html b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_source_cancel.https.html
new file mode 100644
index 00000000000..66f22b1f0c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_source_cancel.https.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/webxr_util.js"></script>
+<script src="../resources/webxr_test_asserts.js"></script>
+<script src="../resources/webxr_test_constants.js"></script>
+<script src="../resources/webxr_test_constants_fake_world.js"></script>
+<canvas />
+
+<script>
+
+// at world origin.
+const VIEWER_ORIGIN_TRANSFORM = {
+  position: [0, 0, 0],
+  orientation: [0, 0, 0, 1],
+};
+
+// at world origin.
+const FLOOR_ORIGIN_TRANSFORM = {
+  position: [0, 0, 0],
+  orientation: [0, 0, 0, 1],
+};
+
+const fakeDeviceInitParams = {
+  supportedModes: ["immersive-ar"],
+  views: VALID_VIEWS,
+  floorOrigin: FLOOR_ORIGIN_TRANSFORM,    // aka mojo_from_floor
+  viewerOrigin: VIEWER_ORIGIN_TRANSFORM,  // aka mojo_from_viewer
+  supportedFeatures: ALL_FEATURES,
+  world: createFakeWorld(5.0, 2.0, 5.0),  // webxr_test_constants_fake_world.js has detailed description of the fake world
+};
+
+const test_function_generator = function(isTransientTest, isSessionEndedTest) {
+  return function(session, fakeDeviceController, t) {
+
+    let done = false;
+
+    return session.requestReferenceSpace('local').then((localSpace) => {
+      const validation_function = (hitTestSource) => {
+
+        const rAFcb = function(time, frame) {
+          if(isSessionEndedTest) {
+            // Session is marked as "ended" synchronously, there is no need to
+            // wait for the promise it returns to settle.
+            session.end();
+
+            // Currently, the specification does not say what happen
+            // when a hit test source gets cancelled post-session-end.
+            hitTestSource.cancel();
+            done = true;
+          } else {
+            hitTestSource.cancel();
+            t.step(() => {
+              assert_throws_dom("InvalidStateError", () => hitTestSource.cancel());
+            });
+            done = true;
+          }
+        };
+
+        session.requestAnimationFrame(rAFcb);
+
+        return t.step_wait(() => done);
+      };
+
+      // Same validation will happen both in transient and non-transient variant
+      if(isTransientTest) {
+        return session.requestHitTestSourceForTransientInput({
+          profile: "generic-touchscreen",
+          offsetRay: new XRRay(),
+        }).then(validation_function);
+      } else {
+        return session.requestHitTestSource({
+          space: localSpace,
+          offsetRay: new XRRay(),
+        }).then(validation_function);
+      }
+    }); // return session.requestReferenceSpace('local').then((localSpace) => { ...
+  };  // return function(session, fakeDeviceController, t) { ...
+}
+
+xr_session_promise_test("Ensures hit test source cancellation works when the session has not ended.",
+  test_function_generator(/*isTransientTest=*/false, /*isSessionEndedTest=*/false),
+  fakeDeviceInitParams,
+  'immersive-ar', { 'requiredFeatures': ['hit-test'] });
+
+xr_session_promise_test("Ensures transient input hit test source cancellation works when the session has not ended.",
+  test_function_generator(/*isTransientTest=*/true, /*isSessionEndedTest=*/false),
+  fakeDeviceInitParams,
+  'immersive-ar', { 'requiredFeatures': ['hit-test'] });
+
+xr_session_promise_test("Ensures hit test source cancellation works when the session has ended",
+  test_function_generator(/*isTransientTest=*/false, /*isSessionEndedTest=*/true),
+  fakeDeviceInitParams,
+  'immersive-ar', { 'requiredFeatures': ['hit-test'] });
+
+xr_session_promise_test("Ensures transient input hit test source cancellation works when the session has ended",
+  test_function_generator(/*isTransientTest=*/true, /*isSessionEndedTest=*/true),
+  fakeDeviceInitParams,
+  'immersive-ar', { 'requiredFeatures': ['hit-test'] });
+
+</script>
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js
new file mode 100644
index 00000000000..52da60be91f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js
@@ -0,0 +1,47 @@
+// META: global=worker
+
+const crossOrigin = "https://{{hosts[alt][]}}:{{ports[https][0]}}";
+const redirectToCrossOrigin = "/common/redirect.py?location=" + crossOrigin;
+
+test(function() {
+  assert_throws_js(SyntaxError, function() {
+    importScripts("/workers/modules/resources/syntax-error.js");
+  });
+}, "Same-origin syntax error");
+
+test(function() {
+  assert_throws_js(Error, function() {
+    importScripts("/workers/modules/resources/throw.js");
+  });
+}, "Same-origin throw");
+
+// https://html.spec.whatwg.org/C/#run-a-classic-script
+// Step 8.2. If rethrow errors is true and script's muted errors is true, then:
+// Step 8.2.2. Throw a "NetworkError" DOMException.
+test(function() {
+  assert_throws_dom("NetworkError", function() {
+    importScripts(crossOrigin +
+                  "/workers/modules/resources/syntax-error.js");
+  });
+}, "Cross-origin syntax error");
+
+test(function() {
+  assert_throws_dom("NetworkError", function() {
+    importScripts(crossOrigin +
+                  "/workers/modules/resources/throw.js");
+  });
+}, "Cross-origin throw");
+
+test(function() {
+  assert_throws_dom("NetworkError", function() {
+    importScripts(redirectToCrossOrigin +
+                  "/workers/modules/resources/syntax-error.js");
+  });
+}, "Redirect-to-cross-origin syntax error");
+
+test(function() {
+  assert_throws_dom("NetworkError", function() {
+    importScripts(redirectToCrossOrigin +
+                  "/workers/modules/resources/throw.js");
+  });
+}, "Redirect-to-Cross-origin throw");
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js
new file mode 100644
index 00000000000..4fd8914856b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js
@@ -0,0 +1,8 @@
+// META: global=dedicatedworker,sharedworker
+// META: script=report-error-helper.js
+const crossOrigin = "https://{{hosts[alt][]}}:{{ports[https][0]}}";
+runTest(
+  crossOrigin + "/workers/modules/resources/syntax-error.js",
+  false,
+  "NetworkError"
+);
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-helper.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-helper.js
new file mode 100644
index 00000000000..7fc6d0dd64b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-helper.js
@@ -0,0 +1,80 @@
+setup({ allow_uncaught_exception:true });
+
+// For SyntaxError, the line in doImportScripts() is expected to be reported
+// as `e.lineno` etc. below.
+// doImportScripts() is introduced here to prevent the line number from being
+// affected by changes in runTest(), use of setTimeout(), etc.
+function doImportScripts(url) {
+  importScripts(url);
+}
+
+const t0 = async_test("WorkerGlobalScope error event: error");
+const t1 = async_test("WorkerGlobalScope error event: message");
+const t2 = async_test("WorkerGlobalScope error event: filename");
+const t3 = async_test("WorkerGlobalScope error event: lineno");
+
+function runTest(importScriptUrl, shouldUseSetTimeout, expected) {
+  self.addEventListener("error", e => {
+    if (expected === "NetworkError") {
+      t0.step_func_done(() => {
+        assert_equals(e.error.constructor, DOMException,
+            "e.error should be a DOMException")
+        assert_equals(e.error.name, "NetworkError");
+      })();
+
+      t1.step_func_done(() => {
+        assert_not_equals(e.message, "Script error.",
+            "e.message should not be muted to 'Script error.'");
+      })();
+
+      // filename, lineno etc. should NOT point to the location within
+      // `syntax-error.js` (otherwise parse errors to be muted are
+      // leaked to JavaScript).
+      // we expect they point to the caller of `importScripts()`,
+      // while this is not explicitly stated in the spec.
+      t2.step_func_done(() => {
+        assert_equals(e.filename, self.location.origin +
+            '/workers/interfaces/WorkerUtils/importScripts/report-error-helper.js');
+      })();
+      t3.step_func_done(() => {
+        assert_equals(e.lineno, 8);
+      })();
+      // We don't check `e.colno` for now, because browsers set different
+      // `colno` values.
+    } else if (expected === "SyntaxError") {
+      t0.step_func_done(() => {
+        assert_equals(e.error.constructor, SyntaxError);
+        assert_equals(e.error.name, "SyntaxError");
+      })();
+
+      t1.step_func_done(() => {
+        assert_not_equals(e.message, "Script error.",
+            "e.message should not be muted to 'Script error.'");
+      })();
+
+      // filename, lineno etc. are expected to point to the location within
+      // `syntax-error.js` because it is same-origin,
+      // while this is not explicitly stated in the spec.
+      t2.step_func_done(() => {
+        assert_equals(e.filename, self.location.origin +
+            '/workers/modules/resources/syntax-error.js');
+      })();
+      t3.step_func_done(() => {
+        assert_equals(e.lineno, 1);
+      })();
+      // We don't check `e.colno` for now, because browsers set different
+      // `colno` values.
+    }
+
+    // Because importScripts() throws, we call done() here.
+    done();
+  });
+
+  if (shouldUseSetTimeout) {
+    setTimeout(
+      () => doImportScripts(importScriptUrl),
+      0);
+  } else {
+    doImportScripts(importScriptUrl);
+  }
+}
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js
new file mode 100644
index 00000000000..2b9600973fb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js
@@ -0,0 +1,9 @@
+// META: global=dedicatedworker,sharedworker
+// META: script=report-error-helper.js
+const crossOrigin = "https://{{hosts[alt][]}}:{{ports[https][0]}}";
+runTest(
+  "/common/redirect.py?location=" + crossOrigin +
+      "/workers/modules/resources/syntax-error.js",
+  false,
+  "NetworkError"
+);
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js
new file mode 100644
index 00000000000..f7de416e117
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js
@@ -0,0 +1,7 @@
+// META: global=dedicatedworker,sharedworker
+// META: script=report-error-helper.js
+runTest(
+  "/workers/modules/resources/syntax-error.js",
+  false,
+  "SyntaxError"
+);
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js
new file mode 100644
index 00000000000..a1bbef7bc45
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js
@@ -0,0 +1,8 @@
+// META: global=dedicatedworker,sharedworker
+// META: script=report-error-helper.js
+const crossOrigin = "https://{{hosts[alt][]}}:{{ports[https][0]}}";
+runTest(
+  crossOrigin + "/workers/modules/resources/syntax-error.js",
+  true,
+  "NetworkError"
+);
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js
new file mode 100644
index 00000000000..2755b337d3d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js
@@ -0,0 +1,9 @@
+// META: global=dedicatedworker,sharedworker
+// META: script=report-error-helper.js
+const crossOrigin = "https://{{hosts[alt][]}}:{{ports[https][0]}}";
+runTest(
+  "/common/redirect.py?location=" + crossOrigin +
+      "/workers/modules/resources/syntax-error.js",
+  true,
+  "NetworkError"
+);
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js
new file mode 100644
index 00000000000..c4f70ebec97
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js
@@ -0,0 +1,7 @@
+// META: global=dedicatedworker,sharedworker
+// META: script=report-error-helper.js
+runTest(
+  "/workers/modules/resources/syntax-error.js",
+  true,
+  "SyntaxError"
+);
diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/throw.js b/tests/wpt/web-platform-tests/workers/modules/resources/throw.js
new file mode 100644
index 00000000000..3d876d43d93
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/modules/resources/throw.js
@@ -0,0 +1 @@
+throw new Error('custom message');