diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
new file mode 100644
index 00000000000..7248ba77bd5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
@@ -0,0 +1,5 @@
+[url-charset.window.html]
+  expected: TIMEOUT
+  [Blob charset should override any auto-detected charset.]
+    expected: TIMEOUT
+
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 76b44d9e9cf..3605e8f3fc9 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: FAIL
+    expected: TIMEOUT
 
   [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-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    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
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
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 bbf756d71c5..abf874274b6 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
@@ -309,30 +309,24 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    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 b2ffc8abf78..e67f0406fc3 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
@@ -53,9 +53,3 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
-  [separate text/javascript error]
-    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
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    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
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[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 8e2a63e3b7f..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,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/canvas/element/transformations/2d.transformation.translate3d.html.ini b/tests/wpt/metadata-layout-2020/html/canvas/element/transformations/2d.transformation.translate3d.html.ini
new file mode 100644
index 00000000000..bcd55fe12c5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/canvas/element/transformations/2d.transformation.translate3d.html.ini
@@ -0,0 +1,4 @@
+[2d.transformation.translate3d.html]
+  [translate3d() function modifies the underlying matrix appropriately]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index f45aaafe1c5..d81ae5a4949 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,16 +1,17 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: NOTRUN
 
   [Element with tabindex should support autofocus]
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 295031c1812..338d283eb0e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
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 d913fcbb129..3080be9afc0 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: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
deleted file mode 100644
index b193c33c2b6..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit.html]
-  [default submit action should supersede onclick submit()]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index 4a713856a76..ecc7be8f573 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,16 +1,4 @@
 [select-event.html]
-  [input type text: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
@@ -20,54 +8,63 @@
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
   [input type text: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: selectionStart a second time (must not fire select)]
+  [input type password: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
new file mode 100644
index 00000000000..178680e5d14
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
@@ -0,0 +1,2 @@
+[script-onerror-insertion-point-2.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
deleted file mode 100644
index 59a54fe88e4..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-delayed.html]
-  [async document.write in a module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
index 7e1a385b339..16ddd043dfa 100644
--- a/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
@@ -1,5 +1,4 @@
 [iframe-inheritance-srcdoc.html]
-  expected: TIMEOUT
   [iframes srcdoc correctly inherit the ancestor's referrer policy]
     expected: FAIL
 
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 a56bad443a2..66bd350083b 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,5 +1,4 @@
 [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/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index b7e13cf7726..f1281b5ae81 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,4 +1,5 @@
 [audiocontext-not-fully-active.html]
+  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
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
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
new file mode 100644
index 00000000000..7248ba77bd5
--- /dev/null
+++ b/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
@@ -0,0 +1,5 @@
+[url-charset.window.html]
+  expected: TIMEOUT
+  [Blob charset should override any auto-detected charset.]
+    expected: TIMEOUT
+
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 d4f62ed7113..faa00f45ecf 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: FAIL
+    expected: TIMEOUT
 
   [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 7db34dde71f..a31f608dd42 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -1180,6 +1180,13 @@
      ]
     },
     "crashtests": {
+     "chrome-bug-1172059.html": [
+      "1c788ab3d8116381af6f6656d89c2811171bdef5",
+      [
+       null,
+       {}
+      ]
+     ],
      "firefox-bug-1688293.html": [
       "9ab1a88312683a66798cb52693c2ba4389222ff4",
       [
@@ -17125,7 +17132,7 @@
        ]
       ],
       "print-manual.html": [
-       "3afef1d4fef99b589d060ea6742331f454325be7",
+       "67cbd0dd4819d716f0c3c43056010f9b979d8c1f",
        [
         null,
         {}
@@ -259881,7 +259888,7 @@
   },
   "support": {
    ".azure-pipelines.yml": [
-    "337d7e326ac920d67117924f5772e40b735c0248",
+    "9f974615e35f47270102e0c81966dbd3b53b0d71",
     []
    ],
    ".codecov.yml": [
@@ -259907,7 +259914,7 @@
       []
      ],
      "manifest.yml": [
-      "84983a57e077b7e9e7f34515e4bca01a9cc214a7",
+      "3210c703b1d8f89371c84716fdc836c4b7508cdb",
       []
      ],
      "pull_request_previews.yml": [
@@ -281931,7 +281938,7 @@
     ],
     "resources": {
      "helpers.js": [
-      "c67d684652884c99dce7c29c6121952941743641",
+      "8bac86b9b913c3d7b7b2e44d9f577a91985046de",
       []
      ],
      "non-main-frame-select.html": [
@@ -283231,6 +283238,10 @@
     ],
     "attributes": {
      "resources": {
+      "domain-child.sub.html": [
+       "72ec083b7867b1ef8daa6266deeb59ccd12dde4c",
+       []
+      ],
       "path": {
        "one.html": [
         "3c5af1cb205daaef2561acf00fc4f01f87a5e193",
@@ -283246,13 +283257,17 @@
        ]
       },
       "path-redirect-shared.js": [
-       "83a614117cd54c23540a7405e15dcbedf96cfa00",
+       "1c2fec0fd5215547cccfffa4955a3b364021dc5d",
        []
       ],
       "path.html": [
        "3c5af1cb205daaef2561acf00fc4f01f87a5e193",
        []
       ],
+      "path.html.headers": [
+       "23de552c1a40a8276d43e1f99e26acb0dbfc3986",
+       []
+      ],
       "pathfakeout": {
        "one.html": [
         "3c5af1cb205daaef2561acf00fc4f01f87a5e193",
@@ -283314,366 +283329,6 @@
        []
       ],
       "test-files": {
-       "domain0001-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0001-test": [
-        "fd8926d7b4fc22c84aa0bb247e3e50632ef71ff3",
-        []
-       ],
-       "domain0002-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0002-test": [
-        "a6ad2a80856c6eca623560ce640ee47ecc3777da",
-        []
-       ],
-       "domain0003-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0003-test": [
-        "ff051f4806c94b1e45dd58dab8f819965b4bd74c",
-        []
-       ],
-       "domain0004-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0004-test": [
-        "f05029bb5a74f2d2b982ff5abf88c3a38e1200b6",
-        []
-       ],
-       "domain0005-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0005-test": [
-        "697ab186fcde49bf34cf169db27ae8d0ae4927f2",
-        []
-       ],
-       "domain0006-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0006-test": [
-        "fe5f90df9dc00b989a4456700677573bbb6aebe4",
-        []
-       ],
-       "domain0007-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0007-test": [
-        "1d2c6fcec6270b002960a719cdff5db8a549d675",
-        []
-       ],
-       "domain0008-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0008-test": [
-        "491c52de9da50c6f668007c0e6a367d049b3c019",
-        []
-       ],
-       "domain0009-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0009-test": [
-        "736e69fe8e5a8498c1f69fd504358c18913ab8e5",
-        []
-       ],
-       "domain0010-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0010-test": [
-        "5bf212f27d8e6312cad86941177a4d5e53a5eff1",
-        []
-       ],
-       "domain0011-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0011-test": [
-        "e1c54db25eda8ba96a7adfd40ea316e1bff4aa85",
-        []
-       ],
-       "domain0012-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0012-test": [
-        "a189f38087a66eefba14ad25b86d6e9135f53ef6",
-        []
-       ],
-       "domain0013-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0013-test": [
-        "8493146e767a9f57eb6ad29a8be2cbd19ca956d7",
-        []
-       ],
-       "domain0014-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0014-test": [
-        "adccd0d3205c71ec3c6b4e8810f80595cff26033",
-        []
-       ],
-       "domain0015-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0015-test": [
-        "c123ba940d31f5e01322579ddd7473b72d9844a6",
-        []
-       ],
-       "domain0016-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0016-test": [
-        "9136ac4d86a80bef4ad4b461d36b9b5a8704911d",
-        []
-       ],
-       "domain0017-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0017-test": [
-        "8e876b8d687072ffb127d6e89b725076b41c38c6",
-        []
-       ],
-       "domain0018-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0018-test": [
-        "3763f9625ef867ad4218de70b5ea06ecae87d0e4",
-        []
-       ],
-       "domain0019-expected": [
-        "1f359c4850bae230784cda7633e3db91ff0f0ee0",
-        []
-       ],
-       "domain0019-test": [
-        "f5aebfd0e10e1b4d39740d1cec7d98a6a757fd7c",
-        []
-       ],
-       "domain0020-expected": [
-        "5eb3ac42d41ac5d9e78a50c6f9f6065651cddac6",
-        []
-       ],
-       "domain0020-test": [
-        "1c7a61c85f6ed7d652b42c3ed23980648bf081ea",
-        []
-       ],
-       "domain0021-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0021-test": [
-        "895744eac5da0a574381b8be74ad96298cc47567",
-        []
-       ],
-       "domain0022-expected": [
-        "1f359c4850bae230784cda7633e3db91ff0f0ee0",
-        []
-       ],
-       "domain0022-test": [
-        "6eeae00159fa2c7350427da96ffbb7b7a46ae7a4",
-        []
-       ],
-       "domain0023-expected": [
-        "5eb3ac42d41ac5d9e78a50c6f9f6065651cddac6",
-        []
-       ],
-       "domain0023-test": [
-        "91a81ed003c55f597dbd15ad7cacc44e22215a67",
-        []
-       ],
-       "domain0024-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0024-test": [
-        "63157b9b4575bc24f424c07ce3b721a8c16ab328",
-        []
-       ],
-       "domain0025-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0025-test": [
-        "353c3bb63461a3599b1c630fada4b3b9173136f2",
-        []
-       ],
-       "domain0026-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0026-test": [
-        "3b14e3075468947ccd7ac5af4aba7c49b8725f78",
-        []
-       ],
-       "domain0027-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0027-test": [
-        "8b7adbd17a17717b7987be1bbc5756dd75050e0d",
-        []
-       ],
-       "domain0028-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0028-test": [
-        "ab8f2c401ebefc02538ec906ec53ee9e29d4ce65",
-        []
-       ],
-       "domain0029-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0029-test": [
-        "cfab57a6e497b65866525e7adbc58c27418288ba",
-        []
-       ],
-       "domain0031-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0031-test": [
-        "6eccb78b8b83ff1d10c1c54ff3f64d87095d63e1",
-        []
-       ],
-       "domain0033-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0033-test": [
-        "7fdcc8356a11456b095e7dcf230373c665b399e1",
-        []
-       ],
-       "domain0034-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0034-test": [
-        "d3f4723fd08ee9502047190ece283fd5f173b78e",
-        []
-       ],
-       "domain0035-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0035-test": [
-        "967d248c25663a97f3f824c5f6b792abee88b28c",
-        []
-       ],
-       "domain0036-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0036-test": [
-        "a618ec4dd203bb73d32ccf357aadcd96d93271e9",
-        []
-       ],
-       "domain0037-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0037-test": [
-        "c61fe8f27629bd8dbefa8c69252ebca22d6bca76",
-        []
-       ],
-       "domain0038-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0038-test": [
-        "2d8fcca573141f8a08cc94f40d03fe1bef615467",
-        []
-       ],
-       "domain0039-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0039-test": [
-        "3225b28baacb8ebce7bbdb1a437da7b3ea4c7fa5",
-        []
-       ],
-       "domain0040-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "domain0040-test": [
-        "3e32fa895c357326a566bbb2643069a09ec29f38",
-        []
-       ],
-       "domain0041-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0041-test": [
-        "6fbc4ad1141721adacaaaafac1083f7d68552aff",
-        []
-       ],
-       "domain0042-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "domain0042-test": [
-        "9258624cc56f45f386609c7244e27847e15673ce",
-        []
-       ],
-       "mozilla0011-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "mozilla0011-test": [
-        "bba20536edd738acdc0d7fa8e5f0cf30050c961f",
-        []
-       ],
-       "optional-domain0030-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "optional-domain0030-test": [
-        "3ab75aa3a07894934f9df01f448dee383a629acb",
-        []
-       ],
-       "optional-domain0041-expected": [
-        "b14d4f69b58c3d9cc7ed1f363d42d625e7bdcf8c",
-        []
-       ],
-       "optional-domain0041-test": [
-        "b85a6c9e43cbed1899cff10c6ca53916176d98db",
-        []
-       ],
-       "optional-domain0042-expected": [
-        "8b137891791fe96927ad78e64b0aad7bded08bdc",
-        []
-       ],
-       "optional-domain0042-test": [
-        "524d192b6e7e3a4ef89669267f0451ab0066d18c",
-        []
-       ],
-       "optional-domain0043-expected": [
-        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-        []
-       ],
-       "optional-domain0043-test": [
-        "506cdc46e521578b6c6ba491b499779bf05f55fc",
-        []
-       ],
        "ordering0001-expected": [
         "3d819593f5365165bfa02550e48084f37c81c33f",
         []
@@ -283695,7 +283350,7 @@
       []
      ],
      "cookie-test.js": [
-      "56e958263d9771efcdc19048a496753f3c87384d",
+      "67c54bc10594ac4e8814a96aa031e6ff786c2861",
       []
      ],
      "cookie.py": [
@@ -334662,7 +334317,7 @@
      []
     ],
     "requirements.txt": [
-     "03ce983831da5d30ad423f9030cb612b30a9fb91",
+     "281c9229ef878e458076ac4ecaa344e8f67337e4",
      []
     ],
     "reviewing-tests": {
@@ -339631,7 +339286,7 @@
     ],
     "resources": {
      "generic-sensor-helpers.js": [
-      "59855742ce4db245f8f2e10c55e323126dcde564",
+      "7070daa0516ea37ca69be5e48c5908f0b1e0dec4",
       []
      ],
      "iframe_sensor_handler.html": [
@@ -340986,7 +340641,7 @@
        []
       ],
       "sandbox-new-execution-context-iframe.html": [
-       "dc15d57c6a352e045ef59d6103ac1540ebc3ad82",
+       "801e78f9c033bf70c6f8a9e5d4d51cd1fe8f7d6a",
        []
       ],
       "sandbox-parse-noscript-ref.html": [
@@ -342606,7 +342261,7 @@
          []
         ],
         "the-canvas-element.yaml": [
-         "229451cdad1c5ea0650f71d907e4d8260bbe5a45",
+         "ec4c4e6d07bf605dea1820d3ebdce98aa8605676",
          []
         ],
         "the-canvas-state.yaml": [
@@ -342614,7 +342269,7 @@
          []
         ],
         "transformations.yaml": [
-         "ffb1e85ec041d5516d133a04edfa597710ff57ef",
+         "add421e4eb5aa83614c66a8d73fb358293daf760",
          []
         ],
         "video.yaml": [
@@ -351919,7 +351574,7 @@
       []
      ],
      "idle-detection-helper.js": [
-      "5d085461835c44090c7fbe45aab874fc9e9e7899",
+      "f053e635e0bd568ca67fa406278eddd2d9cf3898",
       []
      ],
      "idlharness-worker.js": [
@@ -353348,7 +353003,7 @@
      []
     ],
     "scroll-animations.idl": [
-     "efa986d93e351bcb6b4816b51f587c4ed6efa1ba",
+     "872c1dde607d22e6ac267613b55da088394eb91c",
      []
     ],
     "scroll-to-text-fragment.idl": [
@@ -353777,7 +353432,7 @@
     ]
    },
    "lint.ignore": [
-    "e296376fb69cdef8d293d3b13fb620eb20016553",
+    "72e26ff785294cc6036b5417349642a39108bdc9",
     []
    ],
    "loading": {
@@ -355123,7 +354778,7 @@
     ],
     "resources": {
      "imagecapture-helpers.js": [
-      "8301b1c2b64ad5567d13b33be7a37d04ed89fdaf",
+      "8f142cff4194a4d6d899e403c3219eaa90b1a5ef",
       []
      ]
     }
@@ -355889,7 +355544,7 @@
     ],
     "resources": {
      "orientation-event-helpers.js": [
-      "51154ad73765e498650f05e365837fe7fe30fdba",
+      "1f0deba278ee7ca21d48a8c378e3fedb16184ce0",
       []
      ]
     }
@@ -358709,10 +358364,6 @@
        "make-html-script.js": [
         "a013fa64b305b3ceca8a1014afd7e59ff7be7d10",
         []
-       ],
-       "referrer-policy-unsafe-url-navigate-to-srcdoc.html": [
-        "dfdfae1f0d83db7850149c516747a04cb393f795",
-        []
        ]
       }
      },
@@ -359157,11 +358808,11 @@
     ],
     "chromium": {
      "README.md": [
-      "ec953033f9bf5b06bbd2a8b6eccf4fae4760185f",
+      "3813f6de5d7db8a5cbabf89b7642d8ac5fa2eb23",
       []
      ],
      "contacts_manager_mock.js": [
-      "443d50bbc62bef71e408ffba57eb6678772da224",
+      "2ace6d49ffa321a4b249a6971f1bb362cfb0de15",
       []
      ],
      "enable-hyperlink-auditing.js": [
@@ -359169,11 +358820,11 @@
       []
      ],
      "fake-serial.js": [
-      "46a79f0147afa46ff35ee1483bd3d33200b96b58",
+      "1a0f4b521787332a65179af2db675b913f6278e7",
       []
      ],
      "generic_sensor_mocks.js": [
-      "56438824518225a9b1e5c89f1f6b73aa7f4e57c0",
+      "b7b303b6f14d47b98558f26dfc7e4b5c377f18f3",
       []
      ],
      "generic_sensor_mocks.js.headers": [
@@ -359181,7 +358832,7 @@
       []
      ],
      "mock-barcodedetection.js": [
-      "c11f879b5b6e0ce43bffef7f8f5cabe6fba51632",
+      "b0d2e0af0ae40c620c952fe71e4d3818e3a908e2",
       []
      ],
      "mock-barcodedetection.js.headers": [
@@ -359189,7 +358840,7 @@
       []
      ],
      "mock-facedetection.js": [
-      "1275e4dd2f5e24988e723a728dbf5bb4acc4c6cb",
+      "7ae658621ee9c34b9dc1091777ef4ccaff950a02",
       []
      ],
      "mock-facedetection.js.headers": [
@@ -359197,15 +358848,15 @@
       []
      ],
      "mock-idle-detection.js": [
-      "d88d1ad1c55afaee243e1e9146827b073c380613",
+      "afc5b93f500b057d1238a98335b65f9de3d7a885",
       []
      ],
      "mock-imagecapture.js": [
-      "a8f5c896b1f2cc2c90240bd053d218c28dc549dd",
+      "97d45d453bdda968b2356acf0b129d2eb0347f64",
       []
      ],
      "mock-screenenumeration.js": [
-      "2e41f59ea809b6434d9363228b162dbcf3538f61",
+      "fc89b11ea106c8bda9f9deec300915e51fd26dd0",
       []
      ],
      "mock-screenenumeration.js.header": [
@@ -359213,7 +358864,7 @@
       []
      ],
      "mock-textdetection.js": [
-      "427ce38da21a9cd00e11aab313708f2719d8b094",
+      "52ca987e28639a93363b5496a0f0c14a46e2bb50",
       []
      ],
      "mock-textdetection.js.headers": [
@@ -359221,7 +358872,7 @@
       []
      ],
      "nfc-mock.js": [
-      "2665f3db6b3f2a887ec97d10db6c0123e6a2bb4e",
+      "6a0437a7975420bc802b2715a8707bf518092349",
       []
      ],
      "web-bluetooth-test.js": [
@@ -359257,7 +358908,7 @@
       []
      ],
      "webxr-test.js": [
-      "01d2ec23396a9fbe21d25fba90dc8dcd0f9bd0d3",
+      "2846adda6ab414a8593a4c83dc4dbe082adcb62b",
       []
      ],
      "webxr-test.js.headers": [
@@ -359393,7 +359044,7 @@
           []
          ],
          "test_primary_interface_of.html": [
-          "5ce457cafd4fafe227d4e000859b09b604e91415",
+          "a02f40fd7851209d917bdeed268a331d0991507c",
           []
          ],
          "test_to_json_operation.html": [
@@ -359706,7 +359357,7 @@
      ]
     },
     "test-only-api.js": [
-     "ef66e0e733f9c68004129d24b3c9ad12b9aa0708",
+     "a66eb44ede7c15a37fb1a3c5dd5d2abc17177c8d",
      []
     ],
     "test-only-api.js.headers": [
@@ -359857,7 +359508,7 @@
     ],
     "resources": {
      "screenenumeration-helpers.js": [
-      "7d5d52219433d061fed6600c437e32f843be3d5b",
+      "d0e0d9c56bc1ec56ee3e5511312ae652c94997e4",
       []
      ]
     }
@@ -360033,7 +359684,7 @@
     ],
     "resources": {
      "automation.js": [
-      "98f67fb6282ceb866b63a3eb9bfa19d0dc0f1b2d",
+      "e88fdb1a9d23dfd601d5e9e6e11b560be07d577e",
       []
      ],
      "common.js": [
@@ -361646,7 +361297,7 @@
        []
       ],
       "immutable-prototype-serviceworker.js": [
-       "346b998ceac004b93a3fc505828a2614fbef1560",
+       "d8a94ad46befb085791d13f21e6870e09284abe0",
        []
       ],
       "import-echo-cookie-worker.js": [
@@ -362563,7 +362214,7 @@
     ],
     "resources": {
      "shapedetection-helpers.js": [
-      "05424de893dc9ac59d7f40c436bb73c9523da52f",
+      "1b4949b8f6bf00956786e3a33788669eb6f655be",
       []
      ]
     }
@@ -363109,6 +362760,14 @@
       ]
      }
     },
+    "crashtests": {
+     "support": {
+      "used.svg": [
+       "37ce3f57629133e9436f75d122c24cf64bd15ade",
+       []
+      ]
+     }
+    },
     "embedded": {
      "reference": {
       "green-rect-100x100.svg": [
@@ -364147,7 +363806,7 @@
       []
      ],
      "ci_tools_unittest.sh": [
-      "366dcf66de88e6ba29fc85c9697832eead9376c3",
+      "a4d5cbb7de1aea0e9321e65f2fc1a3d6c6e37533",
       []
      ],
      "ci_wptrunner_infrastructure.sh": [
@@ -364667,10 +364326,6 @@
      "4d352302d80e3207d2a33d3130a359de3e53df09",
      []
     ],
-    "py27-flake8.ini": [
-     "dd6ceb6fea4b973c0124df4382f9f1a3a9d5a0d2",
-     []
-    ],
     "py3-flake8.ini": [
      "f8d4776ef66b01fac0bfa2d27320b1ea3f8a497f",
      []
@@ -371228,7 +370883,7 @@
      }
     },
     "tox.ini": [
-     "c72d728239a1640f0babe916fa8c44f99b50023c",
+     "f3b0c4dd3ef6648026e3abd5fa1acc95ede43edc",
      []
     ],
     "wave": {
@@ -371593,7 +371248,7 @@
       ]
      },
      "tox.ini": [
-      "2feec8d1a4ab5decc48aa89219a87c6f3c4ca2c6",
+      "c70a46cc3c95d8e18b25d9518703e7fc0c3b59d9",
       []
      ],
      "utils": {
@@ -371925,7 +371580,7 @@
       ]
      },
      "tox.ini": [
-      "03f4ab5aba0ea0724609b9fdc80917cf68eeed26",
+      "c2f745b5704c21fa09dc032292d2f35bfa034193",
       []
      ],
      "update.py": [
@@ -371941,7 +371596,7 @@
       []
      ],
      "wpt.py": [
-      "9bc6ce6ce9e89f3f0f423d01081125a4a6f6adec",
+      "d47c91ce316f9f948aa3c38221a2cbb93ab8e163",
       []
      ]
     },
@@ -372179,7 +371834,7 @@
       }
      },
      "tox.ini": [
-      "b39b5eb7e95bf327dca39b6a32295381da2d6c90",
+      "2b9bca17fa4c55d825744931fc1c3c7fc59020c7",
       []
      ],
      "wptrunner": {
@@ -374363,7 +374018,7 @@
     ],
     "resources": {
      "nfc-helpers.js": [
-      "659f74ed8b128f8fb785eced13f90e21c53439b7",
+      "35154e287d8134e5a016b89f8ebfbe7db81748b8",
       []
      ],
      "support-iframe.html": [
@@ -378067,7 +377722,7 @@
       []
      ],
      "webxr_util.js": [
-      "fc4ca7d0d379cd81287723fcae0b6e70eeeaed22",
+      "8ca7918298bad1329cf9e0f39c7349070c3169ed",
       []
      ]
     },
@@ -379323,7 +378978,7 @@
     }
    },
    "wpt": [
-    "36d0bed48edaabf20b165a12128da93ceeb64947",
+    "eac84b62e97b4c08ec437e607a9d9e9c35cacd1c",
     []
    ],
    "wpt.py": [
@@ -383719,7 +383374,7 @@
      ]
     ],
     "structured-clone.any.js": [
-     "de633e63b680652e3bfb6ef60026e659d54959b8",
+     "bb469a94eac0a40135af0269c256998d123cb8c8",
      [
       "IndexedDB/structured-clone.any.html?1-20",
       {
@@ -402903,6 +402558,17 @@
    },
    "cookies": {
     "attributes": {
+     "domain": {
+      "domain.sub.html": [
+       "96e2ce071d00e4ef26b1e4c7890cceef9443270e",
+       [
+        null,
+        {
+         "timeout": "long"
+        }
+       ]
+      ]
+     },
      "expires.html": [
       "d5683239486316958479ca32fa7fa08db8fc29a6",
       [
@@ -402913,7 +402579,7 @@
       ]
      ],
      "invalid.html": [
-      "04030c140acf84adc53597142ab09d0d59f9f8cc",
+      "4bc4247775d420eed97cb0ec82e77712abb4f214",
       [
        null,
        {
@@ -403016,15 +402682,6 @@
      ]
     },
     "http-state": {
-     "domain-tests.html": [
-      "e4f763a935d52b0f9c9655d4073757d2f77451e8",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
      "ordering-tests.html": [
       "4dce985ac71a0d48538dc7376dff7102a0fcd78f",
       [
@@ -419228,6 +418885,13 @@
        {}
       ]
      ],
+     "dynamic-rowspan-change.html": [
+      "c02f84b4a5ad13c0984b5277af0230ae942dda4e",
+      [
+       null,
+       {}
+      ]
+     ],
      "fixed-layout-1.html": [
       "3e0d013af1c6970a1180cf19db37e8e7b82cc0c0",
       [
@@ -423534,6 +423198,13 @@
         {}
        ]
       ],
+      "cssUnparsedValue-empty.html": [
+       "34f77d922a3a387fd2e8a850c99b8eb18b24f81f",
+       [
+        null,
+        {}
+       ]
+      ],
       "cssUnparsedValue-indexed-getter-setter.html": [
        "65a65ac0dfe681d1d9155f8565b52eba0b1baf80",
        [
@@ -431575,7 +431246,7 @@
      ]
     },
     "upgrading.html": [
-     "ac0fdff7a2111507632ac2c36fd5c60a6f832b20",
+     "9a28fcbe12f26eeabe89a5d4cefb40e82dadfb6f",
      [
       null,
       {}
@@ -435384,7 +435055,7 @@
       ]
      ],
      "typing-around-link-element-at-collapsed-selection.tentative.html": [
-      "92fa2df233f327083f989c7a8abdf855f5005e61",
+      "9f688c63e34c1b5406cd29bf7c82ce8f641228c8",
       [
        "editing/other/typing-around-link-element-at-collapsed-selection.tentative.html?target=ContentEditable",
        {
@@ -462624,7 +462295,7 @@
        ]
       ],
       "sandbox-new-execution-context.html": [
-       "653729384feccd527e40cbe7b5ba514c09bed8ba",
+       "dc1953aee68e6cd94405d59b94834ca0dcf74fab",
        [
         null,
         {}
@@ -469583,6 +469254,13 @@
          {}
         ]
        ],
+       "2d.transformation.transform.3d.html": [
+        "657fc5d20bd76b206973375cc393b8168e46cb93",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.transformation.transform.identity.html": [
         "a33209ee83c15846487e991341c9a2261e6279c1",
         [
@@ -469624,6 +469302,13 @@
          null,
          {}
         ]
+       ],
+       "2d.transformation.translate3d.html": [
+        "2fee078bb3c2c0d761fa9d7d70bb25991d6e39c5",
+        [
+         null,
+         {}
+        ]
        ]
       },
       "video": {
@@ -488056,7 +487741,7 @@
       },
       "the-canvas-element": {
        "2d.canvas.context.html": [
-        "1d231c4dfaa8eca9ded7ae240094667afdb7f667",
+        "b9d26011e283e7cf07470e51d6f0857a32e7af65",
         [
          null,
          {}
@@ -489598,7 +489283,7 @@
         ]
        ],
        "Image-constructor.html": [
-        "4c1cf2dcd13fa8b197ddc43071375e64a21995d2",
+        "3cfef5f4f9b28b255f8d73f37e271ea1a98c1e1d",
         [
          null,
          {}
@@ -491105,7 +490790,7 @@
         ]
        ],
        "form-requestsubmit.html": [
-        "62ab12c8dfdd9bbd91df15f76cbdc2a5c8832198",
+        "65f4b2187dc78ebeb7f1307b5b8c5580e3fcc390",
         [
          null,
          {}
@@ -492258,21 +491943,21 @@
       },
       "the-popup-element": {
        "popup-element-basic.tentative.html": [
-        "3be3fae9ac9a5bbccc6784a1efb87240574207b8",
+        "0fcc7f40e94cd0d3794c27039caff840d063f407",
         [
          null,
          {}
         ]
        ],
        "popup-shadow-dom.tentative.html": [
-        "f17bdabac4b2bdd1f2e615e3bf90cf6ee1018059",
+        "eef0309a4db21cade0e0a24eff733b273b11457d",
         [
          null,
          {}
         ]
        ],
        "popup-stacking.tentative.html": [
-        "bcba6f064c033aa25291fa7ff4df4ddb4f63d29d",
+        "167b350c42925ecb23402657a1dda7ccee7422e5",
         [
          null,
          {}
@@ -502716,6 +502401,20 @@
       {}
      ]
     ],
+    "add-remove-position-fixed.html": [
+     "19a109e8d76422d6f39fdca5c04f942948ef3b97",
+     [
+      null,
+      {}
+     ]
+    ],
+    "add-remove-position-sticky.html": [
+     "a269dd156996b930aaef4ba78d5755ba830a5951",
+     [
+      null,
+      {}
+     ]
+    ],
     "body-display-change.html": [
      "0576bd6865084fac5d8c5ccc24285709d50f587e",
      [
@@ -502807,6 +502506,13 @@
       {}
      ]
     ],
+    "display-change-with-transform.html": [
+     "36aa438b6e81f0ec7cfc10aa09d7fd9ac4b8645c",
+     [
+      null,
+      {}
+     ]
+    ],
     "fixed-position-move.html": [
      "877c2ba4b34615c41a5b21dbf114df69eef04352",
      [
@@ -510999,7 +510705,7 @@
       ]
      ],
      "create-event.https.html": [
-      "7efcf40155b15c3e2821918df191359f789f9997",
+      "e8a2c469b11bba722d0ac0a285c60b2d7af73113",
       [
        null,
        {}
@@ -511069,7 +510775,7 @@
       ]
      ],
      "create-event.https.html": [
-      "f1e5c0f8ad25ab907473906d6eb782fc178200ab",
+      "a21f95655ed7789b956fb8cdd573e213c7e987c5",
       [
        null,
        {}
@@ -515774,7 +515480,7 @@
    },
    "quirks": {
     "blocks-ignore-line-height.html": [
-     "608a7c15c7996b5ed3cf534379417c3c077c4e82",
+     "c07f6cf49b803ab3d8f625e45356989516f7de5d",
      [
       null,
       {}
@@ -515817,14 +515523,14 @@
      ]
     },
     "line-height-calculation.html": [
-     "7e7f03a99b9c2e399383a715f522346a37094835",
+     "cc5254ae1be2a738e8daba4474bfe551877b789a",
      [
       null,
       {}
      ]
     ],
     "percentage-height-calculation.html": [
-     "e56a03b4b41b72edca91ff261e766fc9d2cc5426",
+     "a40b8b7d3fccb139a2850f2a92e1b0cb15e0ebf8",
      [
       null,
       {}
@@ -515838,7 +515544,7 @@
      ]
     ],
     "table-cell-nowrap-minimum-width-calculation.html": [
-     "2ff00b9ee794c07309c05f2500b4be1b326afd7e",
+     "25590c64a31cb43b500e128f886e4933802a5d2e",
      [
       null,
       {}
@@ -515852,7 +515558,7 @@
      ]
     ],
     "table-cell-width-calculation.html": [
-     "eeb726627b78fdcbf81d3c29b9205f771bd0aca8",
+     "7d76a9194b377d5bd6a51ededc0308ffb291b463",
      [
       null,
       {}
@@ -527367,7 +527073,7 @@
        ]
       ],
       "iframe-inheritance-javascript-child.html": [
-       "e6df2098d472dfa4b26b85bc5b1da0ef0faeefb8",
+       "491f104de4b49b661d8595815000cae2f60423d9",
        [
         null,
         {}
@@ -527388,7 +527094,7 @@
        ]
       ],
       "iframe-inheritance-srcdoc.html": [
-       "356eedd4f48e6263d3f89b1557dfe285738924ac",
+       "5b76f8efccb25ef488fbff2ef2a45f4081fae199",
        [
         null,
         {}
@@ -531395,7 +531101,7 @@
        ]
       ],
       "fetch-on-the-right-interface.https.any.js": [
-       "e98a04b6a0935743b9919608c6b1488ca57f8837",
+       "5ca5f65680c9754c8f2ed8361f6c94bc13e65a0d",
        [
         "service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.serviceworker.html",
         {
@@ -533122,7 +532828,7 @@
      ]
     ],
     "HTMLSlotElement-interface.html": [
-     "4327e5d03e0356b94514d41f9994a5aa0e982bd0",
+     "e22de32167090f7dd4db630931495d84150d52b1",
      [
       null,
       {}
@@ -533150,7 +532856,7 @@
      ]
     ],
     "ShadowRoot-interface.html": [
-     "e95b1d9542e2e3b502693e0063de0980f5a32789",
+     "de7ac91f250306409327ab89eae6a70f105dd630",
      [
       null,
       {}
@@ -534122,7 +533828,7 @@
      ]
     ],
     "detection-options.https.html": [
-     "db870e8e4708e535d844326907a6d85a0154a875",
+     "4b79da2a6e8dc129c367a7f2c3cf3da6832bcc27",
      [
       null,
       {}
@@ -534774,71 +534480,6 @@
     ]
    },
    "storage": {
-    "buckets": {
-     "buckets_basic.tentative.https.any.js": [
-      "fffb9af10cc191e88c0309e279c99ce34a6b701d",
-      [
-       "storage/buckets/buckets_basic.tentative.https.any.html",
-       {
-        "script_metadata": [
-         [
-          "title",
-          "Buckets API: Basic tests for openOrCreate(), keys(), delete()."
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ],
-      [
-       "storage/buckets/buckets_basic.tentative.https.any.serviceworker.html",
-       {
-        "script_metadata": [
-         [
-          "title",
-          "Buckets API: Basic tests for openOrCreate(), keys(), delete()."
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ],
-      [
-       "storage/buckets/buckets_basic.tentative.https.any.sharedworker.html",
-       {
-        "script_metadata": [
-         [
-          "title",
-          "Buckets API: Basic tests for openOrCreate(), keys(), delete()."
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ],
-      [
-       "storage/buckets/buckets_basic.tentative.https.any.worker.html",
-       {
-        "script_metadata": [
-         [
-          "title",
-          "Buckets API: Basic tests for openOrCreate(), keys(), delete()."
-         ],
-         [
-          "global",
-          "window,worker"
-         ]
-        ]
-       }
-      ]
-     ]
-    },
     "estimate-indexeddb.https.any.js": [
      "b0c6b944dd6ff83a00b38cac6d6c4e3ea8424979",
      [
@@ -541384,7 +541025,7 @@
      },
      "interfaces": {
       "foreignObject-graphics.svg": [
-       "000c107b53b70e4548ee320331c2ab33be967a9c",
+       "7745e91f0a3b0308898e13e451b3871e084ae144",
        [
         null,
         {}
@@ -542231,7 +541872,7 @@
      },
      "interfaces": {
       "SVGAnimatedPathData-removed.svg": [
-       "c8d187cd3d263aaeb7054782fc0a904d4fdd6400",
+       "b9e62177cb99e561654a32c6707aed7d2d4b9ef9",
        [
         null,
         {}
@@ -542454,7 +542095,7 @@
     "struct": {
      "UnknownElement": {
       "interface.svg": [
-       "862e5fde273a5b8ad467f8e062b3bb9ec16e5242",
+       "987f20c5e4c0589e159f044c57b6e552d2ef987e",
        [
         null,
         {}
@@ -543192,7 +542833,7 @@
      ]
     ],
     "Node-multiple-arguments.tentative.html": [
-     "f6b9798f5021795da85615252e38b983f53ecc36",
+     "64b04656d35ba922c528581975682fbd61b5e5a1",
      [
       null,
       {}
@@ -543355,7 +542996,7 @@
      ]
     ],
     "block-Node-multiple-arguments.tentative.html": [
-     "f76b3587512d88ba249c7730176df5b1744fea62",
+     "c3e7671534e70b959b30c8ed9cc16429ee23c45d",
      [
       null,
       {}
@@ -546193,7 +545834,7 @@
      ]
     ],
     "urlsearchparams-constructor.any.js": [
-     "f9878373e5e067598054df4682652a0e9ced270a",
+     "d482911350ba0fabeb127d0fb78cbd1dd71d4d45",
      [
       "url/urlsearchparams-constructor.any.html",
       {}
@@ -555583,6 +555224,15 @@
       {}
      ]
     ],
+    "RTCPeerConnection-capture-video.https.html": [
+     "8d2579602a8deb8cec4335d1a804f2ce0d8bb403",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
     "RTCPeerConnection-connectionState.https.html": [
      "d7716a1d4da19acaf3bd8c016543dd1c75b471d6",
      [
@@ -555765,6 +555415,15 @@
       }
      ]
     ],
+    "RTCPeerConnection-relay-canvas.https.html": [
+     "6e9cd068220d6f0ec2a8a77e215a40702f91ee75",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
     "RTCPeerConnection-remote-track-mute.https.html": [
      "c280a7d44d8d2a477f2600c741ed68903e516651",
      [
@@ -563137,7 +562796,7 @@
    },
    "workers": {
     "SharedWorker-MessageEvent-source.any.js": [
-     "faf48cf9386bfd64030c94041f35f0823aaef79c",
+     "e47fd0653550168b514f86eda7347cd722718591",
      [
       "workers/SharedWorker-MessageEvent-source.any.sharedworker.html",
       {
@@ -563271,7 +562930,7 @@
      ]
     ],
     "Worker-constructor-proto.any.js": [
-     "5a4a6aa11377a2fd79435854bb177c912f9d34bc",
+     "297fe6c58b47af6ff4ee206b8268f439b4c09f4b",
      [
       "workers/Worker-constructor-proto.any.serviceworker.html",
       {
@@ -568324,7 +567983,7 @@
      ]
     ],
     "responsexml-document-properties.htm": [
-     "c27a4482cd20765ede2f2f8c2f9c7bd2b7c0ff7b",
+     "cb2edb777ddb9cc24cdf8706e4e80bb3d3276bff",
      [
       null,
       {}
diff --git a/tests/wpt/metadata/cookies/http-state/domain-tests.html.ini b/tests/wpt/metadata/cookies/http-state/domain-tests.html.ini
deleted file mode 100644
index cba99c1097d..00000000000
--- a/tests/wpt/metadata/cookies/http-state/domain-tests.html.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-[domain-tests.html]
-  [domain0036 - domain0036]
-    expected: FAIL
-
-  [domain0035 - domain0035]
-    expected: FAIL
-
-  [domain0029 - domain0029]
-    expected: FAIL
-
-  [domain0022 - domain0022]
-    expected: FAIL
-
-  [domain0005 - domain0005]
-    expected: FAIL
-
-  [optional-domain0041 - optional-domain0041]
-    expected: FAIL
-
-  [domain0003 - domain0003]
-    expected: FAIL
-
-  [domain0019 - domain0019]
-    expected: FAIL
-
-  [domain0040 - domain0040]
-    expected: FAIL
-
-  [domain0025 - domain0025]
-    expected: FAIL
-
-  [domain0020 - domain0020]
-    expected: FAIL
-
-  [domain0001 - domain0001]
-    expected: FAIL
-
-  [domain0038 - domain0038]
-    expected: FAIL
-
-  [domain0039 - domain0039]
-    expected: FAIL
-
-  [domain0033 - domain0033]
-    expected: FAIL
-
-  [domain0031 - domain0031]
-    expected: FAIL
-
-  [domain0023 - domain0023]
-    expected: FAIL
-
-  [domain0012 - domain0012]
-    expected: FAIL
-
-  [domain0008 - domain0008]
-    expected: FAIL
-
-  [domain0009 - domain0009]
-    expected: FAIL
-
-  [domain0026 - domain0026]
-    expected: FAIL
-
-  [domain0004 - domain0004]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    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
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
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 d4f69d0abfb..99896cf2aef 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,30 +309,24 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    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 b2ffc8abf78..e67f0406fc3 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,9 +53,3 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
-  [separate text/javascript error]
-    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
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    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
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[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 2532dceabac..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: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/canvas/element/transformations/2d.transformation.translate3d.html.ini b/tests/wpt/metadata/html/canvas/element/transformations/2d.transformation.translate3d.html.ini
new file mode 100644
index 00000000000..bcd55fe12c5
--- /dev/null
+++ b/tests/wpt/metadata/html/canvas/element/transformations/2d.transformation.translate3d.html.ini
@@ -0,0 +1,4 @@
+[2d.transformation.translate3d.html]
+  [translate3d() function modifies the underlying matrix appropriately]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 6b68e9094e4..dab21cae5d8 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,4 +1,5 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -6,11 +7,11 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: NOTRUN
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 5f60c78e73c..f6a7aca3306 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
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 9df1ac56f2a..963d4cd20ef 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: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
deleted file mode 100644
index b193c33c2b6..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit.html]
-  [default submit action should supersede onclick submit()]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index 4a713856a76..ecc7be8f573 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,16 +1,4 @@
 [select-event.html]
-  [input type text: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
@@ -20,54 +8,63 @@
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
   [input type text: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: selectionStart a second time (must not fire select)]
+  [input type password: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
new file mode 100644
index 00000000000..178680e5d14
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
@@ -0,0 +1,2 @@
+[script-onerror-insertion-point-2.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
deleted file mode 100644
index 59a54fe88e4..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-delayed.html]
-  [async document.write in a module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini b/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
index 7e1a385b339..16ddd043dfa 100644
--- a/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
@@ -1,5 +1,4 @@
 [iframe-inheritance-srcdoc.html]
-  expected: TIMEOUT
   [iframes srcdoc correctly inherit the ancestor's referrer policy]
     expected: FAIL
 
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 a56bad443a2..66bd350083b 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,5 +1,4 @@
 [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/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index b7e13cf7726..f1281b5ae81 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,4 +1,5 @@
 [audiocontext-not-fully-active.html]
+  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/web-platform-tests/.azure-pipelines.yml
index 337d7e326ac..9f974615e35 100644
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@@ -77,6 +77,9 @@ jobs:
   pool:
     vmImage: 'ubuntu-18.04'
   steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.8.x'
   - template: tools/ci/azure/checkout.yml
   - script: |
       set -euo pipefail
diff --git a/tests/wpt/web-platform-tests/.github/workflows/manifest.yml b/tests/wpt/web-platform-tests/.github/workflows/manifest.yml
index 84983a57e07..3210c703b1d 100644
--- a/tests/wpt/web-platform-tests/.github/workflows/manifest.yml
+++ b/tests/wpt/web-platform-tests/.github/workflows/manifest.yml
@@ -10,6 +10,10 @@ jobs:
   build-and-tag:
     runs-on: ubuntu-18.04
     steps:
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
     - name: Checkout
       uses: actions/checkout@v1
       with:
diff --git a/tests/wpt/web-platform-tests/IndexedDB/structured-clone.any.js b/tests/wpt/web-platform-tests/IndexedDB/structured-clone.any.js
index de633e63b68..bb469a94eac 100644
--- a/tests/wpt/web-platform-tests/IndexedDB/structured-clone.any.js
+++ b/tests/wpt/web-platform-tests/IndexedDB/structured-clone.any.js
@@ -15,7 +15,7 @@
 function describe(value) {
   let type, str;
   if (typeof value === 'object' && value) {
-    type = value.__proto__.constructor.name;
+    type = Object.getPrototypeOf(value).constructor.name;
     // Handle Number(-0), etc.
     str = Object.is(value.valueOf(), -0) ? '-0' : String(value);
   } else {
@@ -54,7 +54,7 @@ function cloneObjectTest(value, verifyFunc) {
   cloneTest(value, async (orig, clone) => {
     assert_not_equals(orig, clone);
     assert_equals(typeof clone, 'object');
-    assert_equals(orig.__proto__, clone.__proto__);
+    assert_equals(Object.getPrototypeOf(orig), Object.getPrototypeOf(clone));
     await verifyFunc(orig, clone);
   });
 }
@@ -141,7 +141,7 @@ const strings = [
 ].forEach(value => cloneTest(value, (orig, clone) => {
     assert_not_equals(orig, clone);
     assert_equals(typeof clone, 'object');
-    assert_equals(orig.__proto__, clone.__proto__);
+    assert_equals(Object.getPrototypeOf(orig), Object.getPrototypeOf(clone));
     assert_equals(orig.valueOf(), clone.valueOf());
   }));
 
@@ -261,7 +261,7 @@ cloneObjectTest({foo: true, bar: false}, (orig, clone) => {
   new DOMRect,
   new DOMRectReadOnly(),
 ].forEach(value => cloneObjectTest(value, (orig, clone) => {
-  Object.keys(orig.__proto__).forEach(key => {
+  Object.keys(Object.getPrototypeOf(orig)).forEach(key => {
     assert_equals(orig[key], clone[key], `Property ${key}`);
   });
 }));
diff --git a/tests/wpt/web-platform-tests/contacts/resources/helpers.js b/tests/wpt/web-platform-tests/contacts/resources/helpers.js
index c67d6846528..8bac86b9b91 100644
--- a/tests/wpt/web-platform-tests/contacts/resources/helpers.js
+++ b/tests/wpt/web-platform-tests/contacts/resources/helpers.js
@@ -9,14 +9,7 @@
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
 async function loadChromiumResources() {
-
-  const chromiumResources = [
-    '/gen/third_party/blink/public/mojom/contacts/contacts_manager.mojom.js',
-    '/gen/components/payments/mojom/payment_request_data.mojom.js',
-  ];
-
-  await loadMojoResources(chromiumResources);
-  await loadScript('/resources/chromium/contacts_manager_mock.js');
+  await import('/resources/chromium/contacts_manager_mock.js');
 }
 
 // User Agents must provide their own implementation of `WebContacts`,
diff --git a/tests/wpt/web-platform-tests/cookies/attributes/domain/domain.sub.html b/tests/wpt/web-platform-tests/cookies/attributes/domain/domain.sub.html
new file mode 100644
index 00000000000..96e2ce071d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/attributes/domain/domain.sub.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test cookie domain attribute parsing</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.2.3">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
+  </head>
+  <body>
+    <script>
+      const port    = "{{ports[http][0]}}";
+      const wwwHost = "{{domains[www]}}";
+
+      test(t => {
+        const win = window.open(`http://${wwwHost}:${port}/cookies/attributes/resources/domain-child.sub.html`);
+        fetch_tests_from_window(win);
+      });
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/cookies/attributes/invalid.html b/tests/wpt/web-platform-tests/cookies/attributes/invalid.html
index 04030c140ac..4bc4247775d 100644
--- a/tests/wpt/web-platform-tests/cookies/attributes/invalid.html
+++ b/tests/wpt/web-platform-tests/cookies/attributes/invalid.html
@@ -154,6 +154,11 @@
         expected: "test25",
         name: "Ignore name- and value-less `Set-Cookie: \\t`",
       },
+      {
+        cookie: "test=26; domain=.parser.test; ;; ;=; ,,, ===,abc,=; abracadabra! max-age=20;=;;",
+        expected: "",
+        name: "Ignore cookie with domain that won't domain match (along with other invalid noise)",
+      },
     ];
 
     for (const test of invalidAttributeTests) {
diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/domain-child.sub.html b/tests/wpt/web-platform-tests/cookies/attributes/resources/domain-child.sub.html
new file mode 100644
index 00000000000..72ec083b786
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/attributes/resources/domain-child.sub.html
@@ -0,0 +1,351 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test cookie domain attribute parsing</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.2.3">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/cookies/resources/cookie-test.js"></script>
+  </head>
+  <body>
+    <script>
+      const path        = "path=/cookies/attributes"
+      const port        = "{{ports[http][0]}}";
+      const host        = "{{host}}";              // example.org
+      const wwwHost     = "{{domains[www]}}";      // home.example.org
+      const www1Host    = "{{domains[www1]}}";     // sibling.example.org
+      const www2wwwHost = "{{domains[www2.www]}}"; // subdomain.home.example.org
+
+      // naive helper method to return the TLD for a given domain
+      const getTLD = domain => {
+        let match = /\.[a-z]+$/.exec(domain);
+        if (match) {
+          return match[0];
+        } else {
+          throw 'Domain is malformed!';
+        }
+      }
+
+      // helper to take a domain like "www.example.org"
+      // and return a string like "www.eXaMpLe.org"
+      const makeBizarre = domain => {
+        let bizarre = "";
+        let domainArray = domain.split(".");
+        let secondLevel = domainArray[domainArray.length - 2];
+        for (let i in secondLevel) {
+          if (i % 2 == 1) {
+            bizarre += secondLevel[i].toUpperCase();
+          } else {
+            bizarre += secondLevel[i];
+          }
+        }
+        domainArray[domainArray.length - 2] = bizarre;
+        return domainArray.join(".");
+      }
+
+      // helper to change the current TLD to a TLD that doesn't exist, and is
+      // unlikely to exist in the future. (the main point is that the TLD
+      // *changes*, so there is no domain match, but we cant' predict how WPT
+      // servers may be set up in the wild so picking any valid TLD has the risk
+      // of future (unintentional) domain matching.
+      const changeTLD = domain => {
+        let domainArray = domain.split(".");
+        domainArray[domainArray.length - 1] += "zzz";
+        return domainArray.join(".");
+      }
+
+      const domainTests = [
+        {
+          cookie: `test=1; domain=${wwwHost}`,
+          expected: "test=1",
+          name: "Return cookie for a domain match",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=2; domain=${wwwHost}`,
+          expected: "",
+          name: "No cookie returned for domain mismatch (subdomains differ post-redirect)",
+          location: `http://${www1Host}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=3; domain=.${wwwHost}`,
+          expected: "test=3",
+          name: "Return cookie for a domain match with leading '.'",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=4; domain=${wwwHost}`,
+          expected: "test=4",
+          name: "Return cookie for domain match (domain attribute is suffix of the host name and first level subdomain)",
+          location: `http://${www2wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=5; domain=.${wwwHost}`,
+          expected: "test=5",
+          name: "Return cookie for domain match (domain attribute is suffix of the host name and first level subdomain, with leading '.')",
+          location: `http://${www2wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=6; domain=.${wwwHost}`,
+          expected: "",
+          name: "No cookie returned for domain mismatch (subdomains differ, with leading '.')",
+          location: `http://${www1Host}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=7; domain=${www1Host}`,
+          expected: "",
+          name: "No cookie returned for domain mismatch when cookie was created (which would match after the redirect, with one subdomain level)",
+          location: `http://${www1Host}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=8; domain=.${host}`,
+          expected: "test=8",
+          name: "Return cookie for domain match (domain attribute is suffix of the host name, with leading '.')",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=9; domain=${host}`,
+          expected: "test=9",
+          name: "Return cookie for domain match (domain attribute is suffix of the host name)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=10; domain=..${wwwHost}`,
+          expected: "",
+          name: "No cookie returned for domain attribute with double leading '.'",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=11; domain=www..${host}`,
+          expected: "",
+          name: "No cookie returned for domain attribute with subdomain followed by ..",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=12; domain=  .${wwwHost}`,
+          expected: "test=12",
+          name: "Return cookie for a domain match with leading whitespace and '.'",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=13; domain=  .  ${wwwHost}`,
+          expected: "",
+          name: "No cookie returned for domain attribute with whitespace that surrounds a leading '.'",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=14; domain=${wwwHost}.`,
+          expected: "",
+          name: "No cookie returned for domain attribute with trailing '.'",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=15; domain=${wwwHost}..`,
+          expected: "",
+          name: "No cookie returned for domain attribute with trailing '..'",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=16; domain=${wwwHost} .`,
+          expected: "",
+          name: "No cookie returned for domain attribute with trailing whitespace and '.'",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=17; domain=${getTLD(host)}`,
+          expected: "",
+          name: "No cookie returned for domain attribute with TLD as value",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=18; domain=.${getTLD(host)}`,
+          expected: "",
+          name: "No cookie returned for domain attribute with TLD as value, with leading '.'",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=18b; domain=.${getTLD(host)}.`,
+          expected: "",
+          name: "No cookie returned for domain attribute with TLD as value, with leading and trailing '.'",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: [`testA=19; domain=${wwwHost}`, `testB=19; domain=.${wwwHost}`],
+          expected: "testA=19; testB=19",
+          name: "Return multiple cookies that match on domain (without and with leading '.')",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: [`testB=20; domain=.${wwwHost}`, `testA=20; domain=${wwwHost}`],
+          expected: "testB=20; testA=20",
+          name: "Return multiple cookies that match on domain (with and without leading '.')",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=21; domain="${wwwHost}"`,
+          expected: "",
+          name: "No cookie returned for domain attribute value between quotes",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: [`testA=22; domain=${wwwHost}`, `testB=22; domain=.${host}`],
+          expected: "testA=22; testB=22",
+          name: "Return multiple cookies that match on subdomain and domain (without and with leading '.')",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: [`testB=23; domain=.${host}`, `testA=23; domain=${wwwHost}`],
+          expected: "testB=23; testA=23",
+          name: "Return multiple cookies that match on domain and subdomain (with and without leading '.')",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=24; domain=.${host}; domain=${wwwHost}`,
+          expected: "",
+          name: "No cookie returned when domain attribute does not domain-match (and first does)",
+          location: `http://${www1Host}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=25; domain=${wwwHost}; domain=.${host}`,
+          expected: "test=25",
+          name: "Return cookie for domain attribute match (first does not, but second does)",
+          location: `http://${www1Host}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=26; domain=${makeBizarre(wwwHost)}`,
+          expected: "test=26",
+          name: "Return cookie for domain match (with bizarre capitalization for domain attribute value)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=27; domain="${wwwHost}:${port}"`,
+          expected: "",
+          name: "No cookie returned for domain attribute value with port",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=28; domain=${www2wwwHost}`,
+          expected: "",
+          name: "No cookie returned for domain mismatch when cookie was created (which would match after the redirect, with two subdomain levels)",
+          location: `http://${www2wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=29`,
+          expected: "",
+          name: "No cookie returned for cookie set on different domain (with no domain attribute)",
+          location: `http://${www2wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: "test=30; domain=",
+          expected: "test=30",
+          name: "Return cookie set with bare domain= attribute",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=31; domain=${wwwHost}`,
+          expected: "test=31",
+          name: "Return cookie that domain-matches with bizarre-cased URL",
+          location: `http://${makeBizarre(wwwHost)}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=32; domain=${wwwHost}; domain=${changeTLD(wwwHost)}`,
+          expected: "",
+          name: "No cookie returned for domain attribute mismatch (first attribute matches, but second does not)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=33; domain=${changeTLD(wwwHost)}; domain=${wwwHost}`,
+          expected: "test=33",
+          name: "Return cookie for domain match (first attribute doesn't, but second does)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=34; domain=${wwwHost}; domain=${changeTLD(wwwHost)}; domain=${wwwHost}`,
+          expected: "test=34",
+          name: "Return cookie for domain match (first attribute matches, second doesn't, third does)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=35; domain=${changeTLD(wwwHost)}; domain=${wwwHost}; domain=${changeTLD(wwwHost)}`,
+          expected: "",
+          name: "No cookie returned for domain attribute mismatch (first attribute doesn't, second does, third doesn't)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=36; domain=${wwwHost}; domain=${wwwHost}`,
+          expected: "test=36",
+          name: "Return cookie for domain match (with two identical domain attributes)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=37; domain=${wwwHost}; domain=${host}`,
+          expected: "test=37",
+          name: "Return cookie for domain match (with first domain attribute a match for host name and second as suffix of host name)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=38; domain=${host}; domain=${wwwHost}`,
+          expected: "test=38",
+          name: "Return cookie for domain match (with first domain attribute as suffix of host name and second a match for host name)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=39; domain=.${www1Host}`,
+          expected: "",
+          name: "No cookie set on domain mismatch before a (domain matching) redirect",
+          location: `http://${www1Host}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=40; domain=.${www2wwwHost}`,
+          expected: "",
+          name: "No cookie set on domain mismatch before a (domain matching) redirect (for second level subdomain)",
+          location: `http://${www2wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=41; domain=${host}; domain=`,
+          expected: "test=41",
+          name: "Return cookie for domain match (with first domain attribute as suffix of host name and second a bare attribute)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=42; domain=${www1Host}; domain=`,
+          expected: "",
+          name: "No cookie returned for domain mismatch (with domain mismatch as first domain attribute and second a bare attribute)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: `test=43 domain=${www1Host}; domain=`,
+          expected: "",
+          name: "No cookie returned for domain mismatch (first attribute is a different subdomain and second is bare)",
+          location: `http://${www2wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: [`test=not44; domain=${wwwHost}`, `test=44; domain=.${wwwHost}`],
+          expected: "test=44",
+          name: "Cookies with same name, path, and domain (differing only in leading '.') overwrite each other ('.' second)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+        {
+          cookie: [`test=not45; domain=.${wwwHost}`, `test=45; domain=${wwwHost}`],
+          expected: "test=45",
+          name: "Cookies with same name, path, and domain (differing only in leading '.') overwrite each other ('.' first)",
+          location: `http://${wwwHost}:${port}/cookies/attributes/resources/path.html`,
+        },
+      ];
+
+      for (const test of domainTests) {
+        if (Array.isArray(test.cookie)) {
+          for (let i in test.cookie) {
+            test.cookie[i] += `; ${path}`;
+          }
+        } else {
+          test.cookie += `; ${path}`;
+        }
+
+        httpRedirectCookieTest(test.cookie, test.expected, test.name,
+                               test.location);
+      }
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/path-redirect-shared.js b/tests/wpt/web-platform-tests/cookies/attributes/resources/path-redirect-shared.js
index 83a614117cd..1c2fec0fd52 100644
--- a/tests/wpt/web-platform-tests/cookies/attributes/resources/path-redirect-shared.js
+++ b/tests/wpt/web-platform-tests/cookies/attributes/resources/path-redirect-shared.js
@@ -1,7 +1,22 @@
-window.expireCookie = (cookie) => {
+function expireCookie(cookie) {
   const cookies = Array.isArray(cookie) ? cookie : [cookie];
   for (let c of cookies) {
     document.cookie = c += "; max-age=0";
   }
 }
-window.getCookies = () => document.cookie;
\ No newline at end of file
+
+function getCookies() {
+  return document.cookie;
+}
+
+window.addEventListener("message", (e) => {
+  if (e.data == "getCookies") {
+    const cookies = getCookies();
+    e.source.postMessage({"cookies": cookies}, '*');
+  }
+
+  if (typeof e.data == "object" && 'expireCookie' in e.data) {
+    expireCookie(e.data.expireCookie);
+    e.source.postMessage("expired", '*');
+  }
+});
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/path.html.headers b/tests/wpt/web-platform-tests/cookies/attributes/resources/path.html.headers
new file mode 100644
index 00000000000..23de552c1a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/attributes/resources/path.html.headers
@@ -0,0 +1 @@
+Access-Control-Allow-Origin: *
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/domain-tests.html b/tests/wpt/web-platform-tests/cookies/http-state/domain-tests.html
deleted file mode 100644
index e4f763a935d..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/domain-tests.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Tests cookie setting domain functionality</title>
-    <meta name="timeout" content="long">
-    <meta name=help href="https://tools.ietf.org/html/rfc6265#page-8">
-
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/cookie-http-state-template.js"></script>
-  </head>
-  <body>
-    <div id="log"></div>
-    <div id="iframes"></div>
-    <script>
-      setup({ explicit_timeout: true });
-
-      const TEST_CASES = [
-        {file: "domain0001", name: "domain0001"},
-        {file: "domain0002", name: "domain0002"},
-        {file: "domain0003", name: "domain0003"},
-        {file: "domain0004", name: "domain0004"},
-        {file: "domain0005", name: "domain0005"},
-        {file: "domain0006", name: "domain0006"},
-        {file: "domain0007", name: "domain0007"},
-        {file: "domain0008", name: "domain0008"},
-        {file: "domain0009", name: "domain0009"},
-        {file: "domain0010", name: "domain0010"},
-        {file: "domain0011", name: "domain0011"},
-        {file: "domain0012", name: "domain0012"},
-        {file: "domain0013", name: "domain0013"},
-        {file: "domain0014", name: "domain0014"},
-        {file: "domain0015", name: "domain0015"},
-        {file: "domain0016", name: "domain0016"},
-        {file: "domain0017", name: "domain0017"},
-        {file: "domain0018", name: "domain0018"},
-        {file: "domain0019", name: "domain0019"},
-        {file: "domain0020", name: "domain0020"},
-        {file: "domain0021", name: "domain0021"},
-        {file: "domain0022", name: "domain0022"},
-        {file: "domain0023", name: "domain0023"},
-        {file: "domain0024", name: "domain0024"},
-        {file: "domain0025", name: "domain0025"},
-        {file: "domain0026", name: "domain0026"},
-        {file: "domain0027", name: "domain0027"},
-        {file: "domain0028", name: "domain0028"},
-        {file: "domain0029", name: "domain0029"},
-        {file: "optional-domain0030", name: "optional-domain0030"},
-        {file: "domain0031", name: "domain0031"},
-        {file: "domain0033", name: "domain0033"},
-        {file: "domain0034", name: "domain0034"},
-        {file: "domain0035", name: "domain0035"},
-        {file: "domain0036", name: "domain0036"},
-        {file: "domain0037", name: "domain0037"},
-        {file: "domain0038", name: "domain0038"},
-        {file: "domain0039", name: "domain0039"},
-        {file: "domain0040", name: "domain0040"},
-        {file: "domain0041", name: "domain0041"},
-        {file: "domain0042", name: "domain0042"},
-        {file: "optional-domain0041", name: "optional-domain0041"},
-        {file: "optional-domain0042", name: "optional-domain0042"},
-        {file: "optional-domain0043", name: "optional-domain0043"},
-      ];
-
-      for (const i in TEST_CASES) {
-        const t = TEST_CASES[i];
-        promise_test(createCookieTest(t.file),
-                     t.file + " - " + t.name);
-      }
-
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0001-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0001-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0001-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0001-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0001-test
deleted file mode 100644
index fd8926d7b4f..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0001-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0001
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0002-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0002-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0002-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0002-test
deleted file mode 100644
index a6ad2a80856..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0002-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org
-Location: http://sibling.example.org:8888/cookie-parser-result?domain0002
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0003-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0003-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0003-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0003-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0003-test
deleted file mode 100644
index ff051f4806c..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0003-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=.home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0003
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0004-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0004-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0004-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0004-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0004-test
deleted file mode 100644
index f05029bb5a7..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0004-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org
-Location: http://subdomain.home.example.org:8888/cookie-parser-result?domain0004
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0005-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0005-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0005-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0005-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0005-test
deleted file mode 100644
index 697ab186fcd..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0005-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=.home.example.org
-Location: http://subdomain.home.example.org:8888/cookie-parser-result?domain0005
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0006-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0006-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0006-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0006-test
deleted file mode 100644
index fe5f90df9dc..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0006-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=.home.example.org
-Location: http://sibling.example.org:8888/cookie-parser-result?domain0006
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0007-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0007-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0007-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0007-test
deleted file mode 100644
index 1d2c6fcec62..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0007-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=sibling.example.org
-Location: http://sibling.example.org:8888/cookie-parser-result?domain0007
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0008-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0008-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0008-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0008-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0008-test
deleted file mode 100644
index 491c52de9da..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0008-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0008
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0009-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0009-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0009-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0009-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0009-test
deleted file mode 100644
index 736e69fe8e5..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0009-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0009
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0010-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0010-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0010-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0010-test
deleted file mode 100644
index 5bf212f27d8..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0010-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=..home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0010
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0011-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0011-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0011-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0011-test
deleted file mode 100644
index e1c54db25ed..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0011-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home..example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0011
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0012-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0012-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0012-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0012-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0012-test
deleted file mode 100644
index a189f38087a..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0012-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=  .home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0012
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0013-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0013-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0013-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0013-test
deleted file mode 100644
index 8493146e767..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0013-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=  .  home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0013
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0014-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0014-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0014-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0014-test
deleted file mode 100644
index adccd0d3205..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0014-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org.
-Location: http://home.example.org:8888/cookie-parser-result?domain0014
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0015-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0015-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0015-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0015-test
deleted file mode 100644
index c123ba940d3..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0015-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org..
-Location: http://home.example.org:8888/cookie-parser-result?domain0015
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0016-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0016-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0016-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0016-test
deleted file mode 100644
index 9136ac4d86a..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0016-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org .
-Location: http://home.example.org:8888/cookie-parser-result?domain0016
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0017-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0017-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0017-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0017-test
deleted file mode 100644
index 8e876b8d687..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0017-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0017
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0018-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0018-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0018-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0018-test
deleted file mode 100644
index 3763f9625ef..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0018-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=.org.
-Location: http://home.example.org:8888/cookie-parser-result?domain0018
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0019-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0019-expected
deleted file mode 100644
index 1f359c4850b..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0019-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar; foo2=bar2
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0019-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0019-test
deleted file mode 100644
index f5aebfd0e10..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0019-test
+++ /dev/null
@@ -1,3 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org
-Set-Cookie: foo2=bar2; domain=.home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0019
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0020-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0020-expected
deleted file mode 100644
index 5eb3ac42d41..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0020-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo2=bar2; foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0020-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0020-test
deleted file mode 100644
index 1c7a61c85f6..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0020-test
+++ /dev/null
@@ -1,3 +0,0 @@
-Set-Cookie: foo2=bar2; domain=.home.example.org
-Set-Cookie: foo=bar; domain=home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0020
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0021-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0021-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0021-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0021-test
deleted file mode 100644
index 895744eac5d..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0021-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain="home.example.org"
-Location: http://home.example.org:8888/cookie-parser-result?domain0021
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0022-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0022-expected
deleted file mode 100644
index 1f359c4850b..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0022-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar; foo2=bar2
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0022-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0022-test
deleted file mode 100644
index 6eeae00159f..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0022-test
+++ /dev/null
@@ -1,3 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org
-Set-Cookie: foo2=bar2; domain=.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0022
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0023-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0023-expected
deleted file mode 100644
index 5eb3ac42d41..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0023-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo2=bar2; foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0023-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0023-test
deleted file mode 100644
index 91a81ed003c..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0023-test
+++ /dev/null
@@ -1,3 +0,0 @@
-Set-Cookie: foo2=bar2; domain=.example.org
-Set-Cookie: foo=bar; domain=home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0023
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0024-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0024-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0024-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0024-test
deleted file mode 100644
index 63157b9b457..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0024-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=.example.org; domain=home.example.org
-Location: http://sibling.example.org:8888/cookie-parser-result?domain0024
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0025-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0025-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0025-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0025-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0025-test
deleted file mode 100644
index 353c3bb6346..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0025-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org; domain=.example.org
-Location: http://sibling.example.org:8888/cookie-parser-result?domain0025
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0026-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0026-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0026-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0026-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0026-test
deleted file mode 100644
index 3b14e307546..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0026-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.eXaMpLe.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0026
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0027-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0027-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0027-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0027-test
deleted file mode 100644
index 8b7adbd17a1..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0027-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org:8888
-Location: http://home.example.org:8888/cookie-parser-result?domain0027
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0028-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0028-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0028-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0028-test
deleted file mode 100644
index ab8f2c401eb..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0028-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=subdomain.home.example.org
-Location: http://subdomain.home.example.org:8888/cookie-parser-result?domain0028
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0029-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0029-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0029-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0029-test
deleted file mode 100644
index cfab57a6e49..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0029-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar
-Location: http://subdomain.home.example.org:8888/cookie-parser-result?domain0029
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0031-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0031-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0031-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0031-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0031-test
deleted file mode 100644
index 6eccb78b8b8..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0031-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org; domain=.example.org
-Location: http://sibling.example.org:8888/cookie-parser-result?domain0031
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0033-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0033-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0033-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0033-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0033-test
deleted file mode 100644
index 7fdcc8356a1..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0033-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org
-Location: http://hoMe.eXaMplE.org:8888/cookie-parser-result?domain0033
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0034-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0034-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0034-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0034-test
deleted file mode 100644
index d3f4723fd08..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0034-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org; domain=home.example.com
-Location: http://home.example.org:8888/cookie-parser-result?domain0034
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0035-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0035-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0035-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0035-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0035-test
deleted file mode 100644
index 967d248c256..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0035-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.com; domain=home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0035
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0036-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0036-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0036-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0036-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0036-test
deleted file mode 100644
index a618ec4dd20..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0036-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org; domain=home.example.com; domain=home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0036
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0037-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0037-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0037-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0037-test
deleted file mode 100644
index c61fe8f2762..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0037-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.com; domain=home.example.org; domain=home.example.com
-Location: http://home.example.org:8888/cookie-parser-result?domain0037
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0038-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0038-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0038-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0038-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0038-test
deleted file mode 100644
index 2d8fcca5731..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0038-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org; domain=home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0038
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0039-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0039-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0039-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0039-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0039-test
deleted file mode 100644
index 3225b28baac..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0039-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=home.example.org; domain=example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0039
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0040-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0040-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0040-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0040-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0040-test
deleted file mode 100644
index 3e32fa895c3..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0040-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=example.org; domain=home.example.org
-Location: http://home.example.org:8888/cookie-parser-result?domain0040
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0041-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0041-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0041-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0041-test
deleted file mode 100644
index 6fbc4ad1141..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0041-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=.sibling.example.org
-Location: http://sibling.example.org:8888/cookie-parser-result?domain0041
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0042-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0042-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0042-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0042-test
deleted file mode 100644
index 9258624cc56..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/domain0042-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=.sibling.home.example.org
-Location: http://sibling.home.example.org:8888/cookie-parser-result?domain0042
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/mozilla0011-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/mozilla0011-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/mozilla0011-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/mozilla0011-test
deleted file mode 100644
index bba20536edd..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/mozilla0011-test
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: test=parser; domain=.parser.test; ;; ;=; ,,, ===,abc,=; abracadabra! max-age=20;=;;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0030-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0030-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0030-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0030-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0030-test
deleted file mode 100644
index 3ab75aa3a07..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0030-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=
-Location: http://home.example.org:8888/cookie-parser-result?optional-domain0030
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0041-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0041-expected
deleted file mode 100644
index b14d4f69b58..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0041-expected
+++ /dev/null
@@ -1 +0,0 @@
-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0041-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0041-test
deleted file mode 100644
index b85a6c9e43c..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0041-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=example.org; domain=
-Location: http://home.example.org:8888/cookie-parser-result?optional-domain0041
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0042-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0042-expected
deleted file mode 100644
index 8b137891791..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0042-expected
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0042-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0042-test
deleted file mode 100644
index 524d192b6e7..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0042-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=foo.example.org; domain=
-Location: http://home.example.org:8888/cookie-parser-result?optional-domain0042
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0043-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0043-expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0043-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0043-test
deleted file mode 100644
index 506cdc46e52..00000000000
--- a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/optional-domain0043-test
+++ /dev/null
@@ -1,2 +0,0 @@
-Set-Cookie: foo=bar; domain=foo.example.org; domain=
-Location: http://subdomain.home.example.org:8888/cookie-parser-result?optional-domain0043
diff --git a/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js b/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js
index 56e958263d9..67c54bc1059 100644
--- a/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js
+++ b/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js
@@ -29,13 +29,28 @@ async function getRedirectedCookies(location, cookie) {
     try {
       const iframe = document.createElement('iframe');
       iframe.style = 'display: none';
-      iframe.src = `${location}`;
+      iframe.src = location;
 
       iframe.addEventListener('load', (e) => {
         const win = e.target.contentWindow;
-        const iframeCookies = win.getCookies();
-        win.expireCookie(cookie);
-        resolve(iframeCookies);
+        let iframeCookie;
+        // go ask for the cookie
+        win.postMessage('getCookies', '*');
+
+        // once we get it, send a message to delete on the other
+        // side, then resolve the cookie back to httpRedirectCookieTest
+        window.addEventListener('message', (e) => {
+          if (typeof e.data == 'object' && 'cookies' in e.data) {
+            iframeCookie = e.data.cookies;
+            e.source.postMessage({'expireCookie': cookie}, '*');
+          }
+
+          // wait on the iframe to tell us it deleted the cookies before
+          // resolving, to avoid any state race conditions.
+          if (e.data == 'expired') {
+            resolve(iframeCookie);
+          }
+        });
       }, {once: true});
 
       document.documentElement.appendChild(iframe);
diff --git a/tests/wpt/web-platform-tests/css/css-tables/dynamic-rowspan-change.html b/tests/wpt/web-platform-tests/css/css-tables/dynamic-rowspan-change.html
new file mode 100644
index 00000000000..c02f84b4a5a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/dynamic-rowspan-change.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src='/resources/check-layout-th.js'></script>
+<link rel="author" href="mailto:atotic@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/tables.html#the-td-element">
+<meta name="assert" content="Dynamic changes to rowspan/colspan relayout the table" />
+<style>
+  main table {
+    border-spacing:0;
+  }
+  main td {
+    background: green;
+    width:50px;
+    height:50px;
+    padding: 0;
+  }
+</style>
+
+<main>
+  <table data-expected-width="100">
+    <tr>
+      <td id="rowspan_target"></td>
+    </tr>
+    <tr>
+      <td></td>
+    </tr>
+  </table>
+<br>
+  <table data-expected-width="150">
+    <col style="width:50px">
+    <col style="width:50px">
+    <tr>
+      <td id="colspan_target"></td>
+      <td></td>
+    </tr>
+  </table>
+</main>
+
+<script>
+  document.body.offsetTop;
+  document.querySelector("#rowspan_target").setAttribute("rowspan", "2");
+  document.querySelector("#colspan_target").setAttribute("colspan", "2");
+  checkLayout("main table");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-empty.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-empty.html
new file mode 100644
index 00000000000..34f77d922a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-empty.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>CSSUnparsedValue: Don't crash for empty values</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-cssunparsedvalue-cssunparsedvalue">
+<link rel="help" href="https://crbug.com/1169941">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+'use strict';
+
+test(() => {
+  const result = new CSSUnparsedValue(['']);
+  assert_equals('', result.toString()); // Don't crash.
+}, `Don't crash when serializing empty CSSUnparsedValue`);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/custom-elements/upgrading.html b/tests/wpt/web-platform-tests/custom-elements/upgrading.html
index ac0fdff7a21..9a28fcbe12f 100644
--- a/tests/wpt/web-platform-tests/custom-elements/upgrading.html
+++ b/tests/wpt/web-platform-tests/custom-elements/upgrading.html
@@ -41,20 +41,20 @@ document_types().filter(function (entry) { return !entry.isOwner && !entry.hasBr
         var name = generateNextCustomElementName();
         var unresolvedElement = document.createElement(name);
 
-        assert_equals(unresolvedElement.__proto__, HTMLElement.prototype,
+        assert_equals(Object.getPrototypeOf(unresolvedElement), HTMLElement.prototype,
             '[[Prototype]] internal slot of the unresolved custom element must be the HTMLElement prototype');
 
         return getDocument().then(function (doc) {
             var unresolvedElementInDoc = doc.createElement(name);
             var prototype = (unresolvedElementInDoc.namespaceURI == 'http://www.w3.org/1999/xhtml' ? HTMLElement : Element).prototype;
 
-            assert_equals(unresolvedElementInDoc.__proto__, prototype,
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), prototype,
                 '[[Prototype]] internal slot of the unresolved custom element must be the ' + prototype.toString() + ' prototype');
             var someCustomElement = class extends HTMLElement {};
             customElements.define(name, someCustomElement);
-            assert_equals(unresolvedElementInDoc.__proto__, prototype, '"define" must not upgrade a disconnected unresolved custom elements');
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), prototype, '"define" must not upgrade a disconnected unresolved custom elements');
             doc.documentElement.appendChild(unresolvedElementInDoc);
-            assert_equals(unresolvedElementInDoc.__proto__, prototype,
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), prototype,
                 'Inserting an element into a document without a browsing context must not enqueue a custom element upgrade reaction');
         });
     }, 'Creating an element in ' + documentName + ' and inserting into the document must not enqueue a custom element upgrade reaction');
@@ -63,25 +63,25 @@ document_types().filter(function (entry) { return !entry.isOwner && !entry.hasBr
         var name = generateNextCustomElementName();
         var unresolvedElement = document.createElement(name);
 
-        assert_equals(unresolvedElement.__proto__, HTMLElement.prototype,
+        assert_equals(Object.getPrototypeOf(unresolvedElement), HTMLElement.prototype,
             '[[Prototype]] internal slot of the unresolved custom element must be the HTMLElement prototype');
 
         return getDocument().then(function (doc) {
             var unresolvedElementInDoc = doc.createElement(name);
             var prototype = (unresolvedElementInDoc.namespaceURI == 'http://www.w3.org/1999/xhtml' ? HTMLElement : Element).prototype;
 
-            assert_equals(unresolvedElementInDoc.__proto__, prototype,
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), prototype,
                 '[[Prototype]] internal slot of the unresolved custom element must be the ' + prototype.toString() + ' prototype');
             var someCustomElement = class extends HTMLElement {};
             customElements.define(name, someCustomElement);
-            assert_equals(unresolvedElementInDoc.__proto__, prototype, '"define" must not upgrade a disconnected unresolved custom elements');
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), prototype, '"define" must not upgrade a disconnected unresolved custom elements');
             document.body.appendChild(unresolvedElementInDoc);
 
             if (unresolvedElementInDoc.namespaceURI == 'http://www.w3.org/1999/xhtml') {
-                assert_equals(unresolvedElementInDoc.__proto__, someCustomElement.prototype,
+                assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), someCustomElement.prototype,
                     'Inserting an element into a document with a browsing context must enqueue a custom element upgrade reaction');
             } else {
-                assert_equals(unresolvedElementInDoc.__proto__, prototype,
+                assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), prototype,
                     'Looking up a custom element definition must return null if the element is not in the HTML namespace');
             }
         });
@@ -116,13 +116,13 @@ document_types().filter(function (entry) { return !entry.isOwner && entry.hasBro
             class UnresolvedElement extends docWindow.HTMLElement { };
             var unresolvedElementInDoc = doc.createElement('unresolved-element');
 
-            assert_equals(unresolvedElement.__proto__, HTMLElement.prototype);
-            assert_equals(unresolvedElementInDoc.__proto__, docWindow.HTMLElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElement), HTMLElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), docWindow.HTMLElement.prototype);
 
             docWindow.customElements.define('unresolved-element', UnresolvedElement);
 
-            assert_equals(unresolvedElement.__proto__, HTMLElement.prototype);
-            assert_equals(unresolvedElementInDoc.__proto__, docWindow.HTMLElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElement), HTMLElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), docWindow.HTMLElement.prototype);
 
         });
     }, '"define" in ' + documentName + ' must not enqueue a custom element upgrade reaction on a disconnected unresolved custom element');
@@ -134,14 +134,14 @@ document_types().filter(function (entry) { return !entry.isOwner && entry.hasBro
             class UnresolvedElement extends docWindow.HTMLElement { };
             var unresolvedElementInDoc = doc.createElement('unresolved-element');
 
-            assert_equals(unresolvedElement.__proto__, HTMLElement.prototype);
-            assert_equals(unresolvedElementInDoc.__proto__, docWindow.HTMLElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElement), HTMLElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), docWindow.HTMLElement.prototype);
 
             docWindow.customElements.define('unresolved-element', UnresolvedElement);
             doc.documentElement.appendChild(unresolvedElementInDoc);
 
-            assert_equals(unresolvedElement.__proto__, HTMLElement.prototype);
-            assert_equals(unresolvedElementInDoc.__proto__, UnresolvedElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElement), HTMLElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), UnresolvedElement.prototype);
         });
     }, 'Inserting an unresolved custom element into ' + documentName + ' must enqueue a custom element upgrade reaction');
 
@@ -153,13 +153,13 @@ document_types().filter(function (entry) { return !entry.isOwner && entry.hasBro
             var unresolvedElementInDoc = doc.createElement('unresolved-element');
             doc.documentElement.appendChild(unresolvedElementInDoc);
 
-            assert_equals(unresolvedElement.__proto__, HTMLElement.prototype);
-            assert_equals(unresolvedElementInDoc.__proto__, docWindow.HTMLElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElement), HTMLElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), docWindow.HTMLElement.prototype);
 
             docWindow.customElements.define('unresolved-element', UnresolvedElement);
 
-            assert_equals(unresolvedElement.__proto__, HTMLElement.prototype);
-            assert_equals(unresolvedElementInDoc.__proto__, UnresolvedElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElement), HTMLElement.prototype);
+            assert_equals(Object.getPrototypeOf(unresolvedElementInDoc), UnresolvedElement.prototype);
         });
     }, '"define" in ' + documentName + ' must enqueue a custom element upgrade reaction on a connected unresolved custom element');
 
diff --git a/tests/wpt/web-platform-tests/docs/requirements.txt b/tests/wpt/web-platform-tests/docs/requirements.txt
index 03ce983831d..281c9229ef8 100644
--- a/tests/wpt/web-platform-tests/docs/requirements.txt
+++ b/tests/wpt/web-platform-tests/docs/requirements.txt
@@ -1,4 +1,4 @@
-recommonmark==0.6.0
+recommonmark==0.7.1
 # Pin this to the same major version as https://docs.python.org/3/
 Sphinx==2.4.4  # pyup: <3.0
 sphinx-argparse==0.2.5
diff --git a/tests/wpt/web-platform-tests/editing/other/typing-around-link-element-at-collapsed-selection.tentative.html b/tests/wpt/web-platform-tests/editing/other/typing-around-link-element-at-collapsed-selection.tentative.html
index 92fa2df233f..9f688c63e34 100644
--- a/tests/wpt/web-platform-tests/editing/other/typing-around-link-element-at-collapsed-selection.tentative.html
+++ b/tests/wpt/web-platform-tests/editing/other/typing-around-link-element-at-collapsed-selection.tentative.html
@@ -151,7 +151,11 @@ if (kChildTag[0] === "") {
     innerHTML: `<p>${kParentTag[0]}[abc]${kParentTag[1]}</p>`,
     run: async (utils) => {
       utils.document.execCommand("createLink", false, "about:blank");
-      await utils.sendEndKey();
+      if (!navigator.platform.includes("Mac")) {
+        await utils.sendEndKey();
+      } else {
+        await utils.sendArrowRightKey(utils.kMetaKey);
+      }
       await utils.sendKey("X", utils.kShiftKey);
       await utils.sendKey("Y", utils.kShiftKey);
     },
@@ -196,7 +200,11 @@ if (kChildTag[0] === "") {
     innerHTML: `<p>${kParentTag[0]}[abc]${kParentTag[1]}</p>`,
     run: async (utils) => {
       utils.document.execCommand("createLink", false, "about:blank");
-      await utils.sendHomeKey();
+      if (!navigator.platform.includes("Mac")) {
+        await utils.sendHomeKey();
+      } else {
+        await utils.sendArrowLeftKey(utils.kMetaKey);
+      }
       await utils.sendKey("X", utils.kShiftKey);
       await utils.sendKey("Y", utils.kShiftKey);
     },
diff --git a/tests/wpt/web-platform-tests/generic-sensor/resources/generic-sensor-helpers.js b/tests/wpt/web-platform-tests/generic-sensor/resources/generic-sensor-helpers.js
index 59855742ce4..7070daa0516 100644
--- a/tests/wpt/web-platform-tests/generic-sensor/resources/generic-sensor-helpers.js
+++ b/tests/wpt/web-platform-tests/generic-sensor/resources/generic-sensor-helpers.js
@@ -9,15 +9,9 @@
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
 async function loadChromiumResources() {
-  const chromiumResources = [
-    '/gen/mojo/public/mojom/base/string16.mojom.js',
-    '/gen/services/device/public/mojom/sensor.mojom.js',
-    '/gen/services/device/public/mojom/sensor_provider.mojom.js',
-  ];
-  await loadMojoResources(chromiumResources);
   await loadScript('/resources/testdriver.js');
   await loadScript('/resources/testdriver-vendor.js');
-  await loadScript('/resources/chromium/generic_sensor_mocks.js');
+  await import('/resources/chromium/generic_sensor_mocks.js');
 }
 
 async function initialize_generic_sensor_tests() {
diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context-iframe.html b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context-iframe.html
index dc15d57c6a3..801e78f9c03 100644
--- a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context-iframe.html
+++ b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context-iframe.html
@@ -1,5 +1,5 @@
 <body>
   <script>
-    document.__proto__.changeFromSandboxedIframe = "change from sandboxed iframe";
+    Object.getPrototypeOf(document).changeFromSandboxedIframe = "change from sandboxed iframe";
   </script>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context.html b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context.html
index 653729384fe..dc1953aee68 100644
--- a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context.html
+++ b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context.html
@@ -25,7 +25,7 @@
           assert_equals(iframe.contentDocument, null,
             "New document in sandboxed iframe should have opaque origin");
 
-          assert_equals(iframeAboutBlankDocument.__proto__.changeFromSandboxedIframe, undefined,
+          assert_equals(Object.getPrototypeOf(iframeAboutBlankDocument).changeFromSandboxedIframe, undefined,
             "Sandboxed iframe contents should not have been able to mess with type system of about:blank document");
 
           let iframeAboutBlankContents = iframeAboutBlankDocument.querySelectorAll('body');
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.3d.html b/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.3d.html
new file mode 100644
index 00000000000..657fc5d20bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.3d.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.transformation.transform.3d</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.transformation.transform.3d</h1>
+<p class="desc">transform() with 4x4 matrix concatenates properly</p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("transform() with 4x4 matrix concatenates properly");
+_addTest(function(canvas, ctx) {
+
+const transform = new DOMMatrix([1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]);
+ctx.transform(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+let canvasTransform = ctx.getTransform();
+_assert(transform.toLocaleString() == canvasTransform.toLocaleString(), "transform.toLocaleString() == canvasTransform.toLocaleString()");
+ctx.transform(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+canvasTransform = ctx.getTransform();
+transform.multiplySelf(transform);
+_assert(transform.toLocaleString() == canvasTransform.toLocaleString(), "transform.toLocaleString() == canvasTransform.toLocaleString()");
+
+
+});
+</script>
+
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.translate3d.html b/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.translate3d.html
new file mode 100644
index 00000000000..2fee078bb3c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.translate3d.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.transformation.translate3d</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.transformation.translate3d</h1>
+<p class="desc">translate3d() function modifies the underlying matrix appropriately</p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("translate3d() function modifies the underlying matrix appropriately");
+_addTest(function(canvas, ctx) {
+
+const dx = 2;
+const dy = 3;
+const dz = 4;
+ctx.translate3d(dx, dy, dz);
+let canvasTransform = ctx.getTransform();
+_assert(canvasTransform.m41 = dx, "canvasTransform.m41 = dx");
+_assert(canvasTransform.m42 = dy, "canvasTransform.m42 = dy");
+_assert(canvasTransform.m43 = dz, "canvasTransform.m43 = dz");
+ctx.translate3d(dx, dy, dz);
+canvasTransform = ctx.getTransform();
+_assert(canvasTransform.m41 = 2 * dx, "canvasTransform.m41 = 2 * dx");
+_assert(canvasTransform.m42 = 2 * dy, "canvasTransform.m42 = 2 * dy");
+_assert(canvasTransform.m43 = 2 * dz, "canvasTransform.m43 = 2 * dz");
+
+
+});
+</script>
+
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/the-canvas-element.yaml b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/the-canvas-element.yaml
index 229451cdad1..ec4c4e6d07b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/the-canvas-element.yaml
+++ b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/the-canvas-element.yaml
@@ -151,7 +151,7 @@
   testing:
   - 2d.path.contexttypexxx.basic
   code: |
-    @assert CanvasRenderingContext2D.prototype.__proto__ === Object.prototype;
-    @assert ctx.__proto__ === CanvasRenderingContext2D.prototype;
+    @assert Object.getPrototypeOf(CanvasRenderingContext2D.prototype) === Object.prototype;
+    @assert Object.getPrototypeOf(ctx) === CanvasRenderingContext2D.prototype;
     t.done();
 
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/transformations.yaml b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/transformations.yaml
index ffb1e85ec04..add421e4eb5 100644
--- a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/transformations.yaml
+++ b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/transformations.yaml
@@ -411,4 +411,35 @@
     const canvasTransform = ctx.getTransform();
     @assert transform.toLocaleString() == canvasTransform.toLocaleString();
 
+- name: 2d.transformation.transform.3d
+  desc: transform() with 4x4 matrix concatenates properly
+  testing:
+  - 2d.transformation.transform.3d
+  code: |
+    const transform = new DOMMatrix([1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]);
+    ctx.transform(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    let canvasTransform = ctx.getTransform();
+    @assert transform.toLocaleString() == canvasTransform.toLocaleString();
+    ctx.transform(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    canvasTransform = ctx.getTransform();
+    transform.multiplySelf(transform);
+    @assert transform.toLocaleString() == canvasTransform.toLocaleString();
 
+- name: 2d.transformation.translate3d
+  desc: translate3d() function modifies the underlying matrix appropriately
+  testing:
+  - 2d.transformation.translate3d
+  code: |
+    const dx = 2;
+    const dy = 3;
+    const dz = 4;
+    ctx.translate3d(dx, dy, dz);
+    let canvasTransform = ctx.getTransform();
+    @assert canvasTransform.m41 = dx;
+    @assert canvasTransform.m42 = dy;
+    @assert canvasTransform.m43 = dz;
+    ctx.translate3d(dx, dy, dz);
+    canvasTransform = ctx.getTransform();
+    @assert canvasTransform.m41 = 2 * dx;
+    @assert canvasTransform.m42 = 2 * dy;
+    @assert canvasTransform.m43 = 2 * dz;
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html
index 1d231c4dfaa..b9d26011e28 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html
@@ -19,8 +19,8 @@
 var t = async_test("checks CanvasRenderingContext2D prototype");
 _addTest(function(canvas, ctx) {
 
-_assertSame(CanvasRenderingContext2D.prototype.__proto__, Object.prototype, "CanvasRenderingContext2D.prototype.__proto__", "Object.prototype");
-_assertSame(ctx.__proto__, CanvasRenderingContext2D.prototype, "ctx.__proto__", "CanvasRenderingContext2D.prototype");
+_assertSame(Object.getPrototypeOf(CanvasRenderingContext2D.prototype), Object.prototype, "Object.getPrototypeOf(CanvasRenderingContext2D.prototype)", "Object.prototype");
+_assertSame(Object.getPrototypeOf(ctx), CanvasRenderingContext2D.prototype, "Object.getPrototypeOf(ctx)", "CanvasRenderingContext2D.prototype");
 t.done();
 
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/Image-constructor.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/Image-constructor.html
index 4c1cf2dcd13..3cfef5f4f9b 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/Image-constructor.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/Image-constructor.html
@@ -28,10 +28,10 @@
 
   test(function() {
       assert_equals(Image.name, "Image", "Image name should be Image (not HTMLImageElement)");
-      assert_equals(Image.__proto__, Function.prototype, "Image __proto__ is Function prototype");
+      assert_equals(Object.getPrototypeOf(Image), Function.prototype, "Image's prototype is Function.prototype");
       assert_equals(Image.prototype, HTMLImageElement.prototype, "Image.prototype is same as HTMLImageElement.prototype");
-      assert_equals(new Image().__proto__, HTMLImageElement.prototype, "Image __proto__ is HTMLImageElement prototype ");
-      assert_equals(Image.prototype.__proto__, HTMLElement.prototype, "Image.prototype __proto__ is HTMLElement prototype");
+      assert_equals(Object.getPrototypeOf(new Image()), HTMLImageElement.prototype, "new Image()'s prototype is HTMLImageElement.prototype ");
+      assert_equals(Object.getPrototypeOf(Image.prototype), HTMLElement.prototype, "Image.prototype's prototype is HTMLElement.prototype");
 
       const desc = Object.getOwnPropertyDescriptor(Image, "prototype");
       assert_false(desc.configurable, "Image.prototype is not configurable");
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-requestsubmit.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-requestsubmit.html
index 62ab12c8dfd..65f4b2187dc 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-requestsubmit.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-requestsubmit.html
@@ -173,4 +173,24 @@ async_test(t => {
   }));
 }, 'The value of the submitter should be appended, and form* ' +
     'attributes of the submitter should be handled.');
+
+test(() => {
+  document.body.insertAdjacentHTML('afterbegin', `<form>
+      <input name="n1" value="v1">
+      <button type="submit" name="n2" value="v2"></button>
+      </form>
+      <form id="form2"></form>`);
+  let form = document.querySelector('form');
+  let formDataInEvent = null;
+  let submitter = form.querySelector('button[type=submit]');
+  form.addEventListener('submit', e => {
+    e.preventDefault();
+    formDataInEvent = new FormData(e.target);
+  });
+
+  form.requestSubmit(submitter);
+  assert_equals(formDataInEvent.get('n1'), 'v1');
+  assert_false(formDataInEvent.has('n2'));
+}, 'The constructed FormData object should not contain an entry for the submit button that was used to submit the form.');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html
index 3be3fae9ac9..0fcc7f40e94 100644
--- a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-element-basic.tentative.html
@@ -16,31 +16,35 @@
   const popup1 = document.getElementById('p1');
   const popup2 = document.getElementById('p2');
 
+  function popupVisible(popup) {
+    return !!(popup.offsetWidth || popup.offsetHeight || popup.getClientRects().length);
+  }
+
   test(function(){
     assert_false(popup1.open);
     assert_false(popup2.open);
-    assert_equals(getComputedStyle(popup2).display,"none");
   }, 'The IDL "open" content attribute must have no effect, and must not be reflected to the WebIDL.');
 
   test(function(){
     assert_false(popup1.open);
     assert_false(popup1.hasAttribute("open"));
-    assert_equals(getComputedStyle(popup1).display,"none");
+    assert_false(popupVisible(popup1));
     popup1.open = true; // Should have no effect
     assert_false(popup1.open);
+    assert_false(popupVisible(popup1));
     popup1.show();
     assert_true(popup1.open);
     assert_false(popup1.hasAttribute("open"));
-    assert_not_equals(getComputedStyle(popup1).display,"none");
+    assert_true(popupVisible(popup1));
     popup1.open = false; // Should have no effect
     assert_true(popup1.open);
     popup1.hide();
     assert_false(popup1.open);
     assert_false(popup1.hasAttribute("open"));
-    assert_equals(getComputedStyle(popup1).display,"none");
+    assert_false(popupVisible(popup1));
     popup1.setAttribute("open","");
     assert_false(popup1.open,'Setting open attribute should not reflect to the WebIDL');
     assert_true(popup1.hasAttribute("open"));
-    assert_equals(getComputedStyle(popup1).display,"none");
+    assert_false(popupVisible(popup1));
   }, "The only visibility control for <popup> is through .show() and .hide().");
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-shadow-dom.tentative.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-shadow-dom.tentative.html
index f17bdabac4b..eef0309a4db 100644
--- a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-shadow-dom.tentative.html
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-shadow-dom.tentative.html
@@ -36,9 +36,7 @@
     return findPopups(testRoot);
   }
   function popupVisible(popup) {
-    const style = getComputedStyle(popup);
-    return !!(style.display !== "none" && style.visibility !== "hidden" &&
-      (popup.offsetWidth || popup.offsetHeight || popup.getClientRects().length));
+    return !!(popup.offsetWidth || popup.offsetHeight || popup.getClientRects().length);
   }
   function showPopup(testId,popupNum) {
     getPopupReferences(testId)[popupNum].show();
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html
index bcba6f064c0..167b350c429 100644
--- a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html
@@ -14,9 +14,11 @@
 </popup>
 <popup id=p3 anchor=b3><p>This is popup #3</p></popup>
 <popup id=p4 anchor=b4><p>This is popup #4</p></popup>
-
 <button id=b1 onclick='p1.show()'>Popup 1</button>
 
+<dialog id=d1>This is a dialog<button onclick='this.parentElement.close()'>Close</button></dialog>
+<button id=b5 onclick='d1.show()'>Dialog</button>
+
 <script>
   const popups = [p1, p2, p3, p4];
 
@@ -45,6 +47,34 @@
     p1.hide();
     assertState(false,false,false,false);
   }, "popup stacking behavior")
+
+  test(function() {
+    function openManyPopups() {
+      p1.show();
+      p2.show();
+      p3.show();
+      assertState(true,true,true,false);
+    }
+    openManyPopups();
+    d1.show(); // Dialog.show() should hide all popups.
+    assertState(false,false,false,false);
+    d1.close();
+    openManyPopups();
+    d1.showModal(); // Dialog.showModal() should also hide all popups.
+    assertState(false,false,false,false);
+    d1.close();
+  }, "popups should be closed by dialogs")
+
+  test(function() {
+    d1.show();
+    assert_true(d1.open);
+    p1.show();
+    assertState(true,false,false,false);
+    assert_true(d1.open);
+    p1.hide();
+    assert_true(d1.open);
+    d1.close();
+  }, "dialogs should not be closed by popups")
 </script>
 
 <style>
diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-manual.html b/tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-manual.html
index 3afef1d4fef..67cbd0dd481 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-manual.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-manual.html
@@ -50,7 +50,7 @@ function testBtn(btn) {
     // t.step_func() does not preserve `this`, which we test below.
     t.step(() => {
       out("beforeprint");
-      assert_equals(ev.__proto__, Event.prototype);
+      assert_equals(Object.getPrototypeOf(ev), Event.prototype);
       assert_equals(this, window);
       assert_equals(ev.target, window);
       assert_equals(ev.type, "beforeprint");
@@ -60,7 +60,7 @@ function testBtn(btn) {
     // t.step_func() does not preserve `this`, which we test below.
     t.step(() => {
       out("afterprint");
-      assert_equals(ev.__proto__, Event.prototype);
+      assert_equals(Object.getPrototypeOf(ev), Event.prototype);
       assert_equals(this, window);
       assert_equals(ev.target, window);
       assert_equals(ev.type, "afterprint");
diff --git a/tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-helper.js b/tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-helper.js
index 5d085461835..f053e635e0b 100644
--- a/tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-helper.js
+++ b/tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-helper.js
@@ -10,12 +10,5 @@
 //   --enable-blink-features=MojoJS,MojoJSTest
 
 async function loadChromiumResources() {
-  const chromiumResources = [
-    '/gen/mojo/public/mojom/base/string16.mojom.js',
-    '/gen/mojo/public/mojom/base/time.mojom.js',
-    '/gen/third_party/blink/public/mojom/idle/idle_manager.mojom.js'
-  ];
-
-  await loadMojoResources(chromiumResources);
-  await loadScript('/resources/chromium/mock-idle-detection.js');
+  await import('/resources/chromium/mock-idle-detection.js');
 }
diff --git a/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl b/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
index efa986d93e3..872c1dde607 100644
--- a/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
+++ b/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
@@ -18,8 +18,7 @@ typedef (ContainerBasedOffset or ElementBasedOffset) ScrollTimelineOffset;
 dictionary ScrollTimelineOptions {
   Element? source;
   ScrollDirection orientation = "block";
-  ScrollTimelineOffset start = "auto";
-  ScrollTimelineOffset end = "auto";
+  sequence<ScrollTimelineOffset> scrollOffsets = [];
   (double or ScrollTimelineAutoKeyword) timeRange = "auto";
 };
 
@@ -28,8 +27,7 @@ interface ScrollTimeline : AnimationTimeline {
   constructor(optional ScrollTimelineOptions options = {});
   readonly attribute Element? source;
   readonly attribute ScrollDirection orientation;
-  readonly attribute ScrollTimelineOffset start;
-  readonly attribute ScrollTimelineOffset end;
+  readonly attribute FrozenArray<ScrollTimelineOffset> scrollOffsets;
   readonly attribute (double or ScrollTimelineAutoKeyword) timeRange;
 };
 
@@ -46,7 +44,6 @@ interface CSSScrollTimelineRule : CSSRule {
     readonly attribute CSSOMString name;
     readonly attribute CSSOMString source;
     readonly attribute CSSOMString orientation;
-    readonly attribute CSSOMString start;
-    readonly attribute CSSOMString end;
+    readonly attribute CSSOMString scrollOffsets;
     readonly attribute CSSOMString timeRange;
 };
diff --git a/tests/wpt/web-platform-tests/layout-instability/add-remove-position-fixed.html b/tests/wpt/web-platform-tests/layout-instability/add-remove-position-fixed.html
new file mode 100644
index 00000000000..19a109e8d76
--- /dev/null
+++ b/tests/wpt/web-platform-tests/layout-instability/add-remove-position-fixed.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<title>Layout Instability: no shift for adding/removing position:fixed</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<div id="target" style="width: 100px; height: 100px; background: green;
+                        position: absolute; top: 200px"></div>
+<div style="height: 2000px"></div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+
+  window.scrollTo(0, 1000);
+  target.style.position = 'fixed';
+  target.style.top = 0;
+
+  await waitForAnimationFrames(3);
+  assert_equals(watcher.score, 0);
+
+  window.scrollTo(0, 100);
+  target.style.position = 'absolute';
+  target.style.top = '200px';
+
+  await waitForAnimationFrames(3);
+  assert_equals(watcher.score, 0);
+}, "No shift for adding/removing position:fixed.");
+
+</script>
+
+
diff --git a/tests/wpt/web-platform-tests/layout-instability/add-remove-position-sticky.html b/tests/wpt/web-platform-tests/layout-instability/add-remove-position-sticky.html
new file mode 100644
index 00000000000..a269dd15699
--- /dev/null
+++ b/tests/wpt/web-platform-tests/layout-instability/add-remove-position-sticky.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>Layout Instability: no shift for adding/removing position:sticky</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<div id="target" style="width: 100px; height: 100px; background: green"></div>
+<div style="height: 2000px"></div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+
+  target.style.position = 'sticky';
+
+  await waitForAnimationFrames(3);
+  assert_equals(watcher.score, 0);
+
+  target.style.position = 'static';
+
+  await waitForAnimationFrames(3);
+  assert_equals(watcher.score, 0);
+}, "No shift for adding/removing position:sticky.");
+
+</script>
+
+
diff --git a/tests/wpt/web-platform-tests/layout-instability/display-change-with-transform.html b/tests/wpt/web-platform-tests/layout-instability/display-change-with-transform.html
new file mode 100644
index 00000000000..36aa438b6e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/layout-instability/display-change-with-transform.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<title>Layout Instability: change display type with transform</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+  }
+  #target {
+    transform: translateX(0);
+  }
+</style>
+<div id=target>
+  <div id=shift>test</div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+  await waitForAnimationFrames(2);
+
+  target.style.display = 'flex';
+
+  await waitForAnimationFrames(1);
+
+  assert_equals(watcher.score, 0);
+}, 'Shift accompanied by body display change.');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index e296376fb69..72e26ff7852 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -727,20 +727,20 @@ WEB-PLATFORM.TEST:web-bundle/subresource-loading/*.html
 # Tests that depend on resources in /gen/ in Chromium:
 # https://github.com/web-platform-tests/wpt/issues/16455
 # Please consult with ecosystem-infra@chromium.org before adding more.
-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/resources/idle-detection-helper.js
-MISSING DEPENDENCY: mediacapture-image/resources/imagecapture-helpers.js
-MISSING DEPENDENCY: orientation-event/resources/orientation-event-helpers.js
+MISSING DEPENDENCY: resources/chromium/contacts_manager_mock.js
 MISSING DEPENDENCY: resources/chromium/web-bluetooth-test.js
 MISSING DEPENDENCY: resources/chromium/webusb-test.js
-MISSING DEPENDENCY: resources/test-only-api.js
-MISSING DEPENDENCY: screen_enumeration/resources/screenenumeration-helpers.js
-MISSING DEPENDENCY: serial/resources/automation.js
-MISSING DEPENDENCY: shape-detection/resources/shapedetection-helpers.js
-MISSING DEPENDENCY: web-nfc/resources/nfc-helpers.js
-MISSING DEPENDENCY: webxr/resources/webxr_util.js
+MISSING DEPENDENCY: resources/chromium/fake-serial.js
+MISSING DEPENDENCY: resources/chromium/generic_sensor_mocks.js
+MISSING DEPENDENCY: resources/chromium/mock-barcodedetection.js
+MISSING DEPENDENCY: resources/chromium/mock-facedetection.js
+MISSING DEPENDENCY: resources/chromium/mock-idle-detection.js
+MISSING DEPENDENCY: resources/chromium/mock-imagecapture.js
+MISSING DEPENDENCY: resources/chromium/mock-screenenumeration.js
+MISSING DEPENDENCY: resources/chromium/mock-textdetection.js
+MISSING DEPENDENCY: resources/chromium/nfc-mock.js
+MISSING DEPENDENCY: resources/chromium/webxr-test.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/resources/imagecapture-helpers.js b/tests/wpt/web-platform-tests/mediacapture-image/resources/imagecapture-helpers.js
index 8301b1c2b64..8f142cff419 100644
--- a/tests/wpt/web-platform-tests/mediacapture-image/resources/imagecapture-helpers.js
+++ b/tests/wpt/web-platform-tests/mediacapture-image/resources/imagecapture-helpers.js
@@ -10,11 +10,7 @@
 //   --enable-blink-features=MojoJS,MojoJSTest
 
 async function loadChromiumResources() {
-  const chromiumResources = [
-    '/gen/media/capture/mojom/image_capture.mojom.js'
-  ];
-  await loadMojoResources(chromiumResources);
-  await loadScript('/resources/chromium/mock-imagecapture.js');
+  await import('/resources/chromium/mock-imagecapture.js');
 }
 
 async function initialize_image_capture_tests() {
diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/create-event.https.html b/tests/wpt/web-platform-tests/orientation-event/motion/create-event.https.html
index 7efcf40155b..e8a2c469b11 100644
--- a/tests/wpt/web-platform-tests/orientation-event/motion/create-event.https.html
+++ b/tests/wpt/web-platform-tests/orientation-event/motion/create-event.https.html
@@ -15,7 +15,7 @@ test(test => {
   });
 
   assert_equals(typeof event, 'object');
-  assert_equals(event.__proto__, DeviceMotionEvent.prototype);
+  assert_equals(Object.getPrototypeOf(event), DeviceMotionEvent.prototype);
 
   assert_true('type' in event);
   assert_true('bubbles' in event);
diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/create-event.https.html b/tests/wpt/web-platform-tests/orientation-event/orientation/create-event.https.html
index f1e5c0f8ad2..a21f95655ed 100644
--- a/tests/wpt/web-platform-tests/orientation-event/orientation/create-event.https.html
+++ b/tests/wpt/web-platform-tests/orientation-event/orientation/create-event.https.html
@@ -15,7 +15,7 @@ test(test => {
   });
 
   assert_equals(typeof event, 'object');
-  assert_equals(event.__proto__, DeviceOrientationEvent.prototype);
+  assert_equals(Object.getPrototypeOf(event), DeviceOrientationEvent.prototype);
 
   assert_true('type' in event);
   assert_true('bubbles' in event);
diff --git a/tests/wpt/web-platform-tests/orientation-event/resources/orientation-event-helpers.js b/tests/wpt/web-platform-tests/orientation-event/resources/orientation-event-helpers.js
index 51154ad7376..1f0deba278e 100644
--- a/tests/wpt/web-platform-tests/orientation-event/resources/orientation-event-helpers.js
+++ b/tests/wpt/web-platform-tests/orientation-event/resources/orientation-event-helpers.js
@@ -9,13 +9,7 @@
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
 async function loadChromiumResources() {
-  const chromiumResources = [
-    '/gen/mojo/public/mojom/base/string16.mojom.js',
-    '/gen/services/device/public/mojom/sensor.mojom.js',
-    '/gen/services/device/public/mojom/sensor_provider.mojom.js',
-  ];
-  await loadMojoResources(chromiumResources);
-  await loadScript('/resources/chromium/generic_sensor_mocks.js');
+  await import('/resources/chromium/generic_sensor_mocks.js');
 }
 
 async function initialize_generic_sensor_tests() {
diff --git a/tests/wpt/web-platform-tests/quirks/blocks-ignore-line-height.html b/tests/wpt/web-platform-tests/quirks/blocks-ignore-line-height.html
index 608a7c15c79..c07f6cf49b8 100644
--- a/tests/wpt/web-platform-tests/quirks/blocks-ignore-line-height.html
+++ b/tests/wpt/web-platform-tests/quirks/blocks-ignore-line-height.html
@@ -31,7 +31,7 @@
         s.document.close();
         [q, a, s].forEach(function(win) {
             ['style', 'test', 'ref', 's_ref'].forEach(function(id) {
-                win.__proto__.__defineGetter__(id, function() { return win.document.getElementById(id); });
+                Object.getPrototypeOf(win).__defineGetter__(id, function() { return win.document.getElementById(id); });
             });
         });
 
diff --git a/tests/wpt/web-platform-tests/quirks/line-height-calculation.html b/tests/wpt/web-platform-tests/quirks/line-height-calculation.html
index 7e7f03a99b9..cc5254ae1be 100644
--- a/tests/wpt/web-platform-tests/quirks/line-height-calculation.html
+++ b/tests/wpt/web-platform-tests/quirks/line-height-calculation.html
@@ -36,7 +36,7 @@
         s.document.close();
         [q, a, s].forEach(function(win) {
             ['style', 'test', 'ref', 's_ref'].forEach(function(id) {
-                win.__proto__.__defineGetter__(id, function() { return win.document.getElementById(id); });
+                Object.getPrototypeOf(win).__defineGetter__(id, function() { return win.document.getElementById(id); });
             });
         });
 
diff --git a/tests/wpt/web-platform-tests/quirks/percentage-height-calculation.html b/tests/wpt/web-platform-tests/quirks/percentage-height-calculation.html
index e56a03b4b41..a40b8b7d3fc 100644
--- a/tests/wpt/web-platform-tests/quirks/percentage-height-calculation.html
+++ b/tests/wpt/web-platform-tests/quirks/percentage-height-calculation.html
@@ -42,7 +42,7 @@
         s.document.close();
         [q, a, s].forEach(function(win) {
             ['style', 'test'].forEach(function(id) {
-                win.__proto__.__defineGetter__(id, function() { return win.document.getElementById(id); });
+                Object.getPrototypeOf(win).__defineGetter__(id, function() { return win.document.getElementById(id); });
             });
         });
 
diff --git a/tests/wpt/web-platform-tests/quirks/table-cell-nowrap-minimum-width-calculation.html b/tests/wpt/web-platform-tests/quirks/table-cell-nowrap-minimum-width-calculation.html
index 2ff00b9ee79..25590c64a31 100644
--- a/tests/wpt/web-platform-tests/quirks/table-cell-nowrap-minimum-width-calculation.html
+++ b/tests/wpt/web-platform-tests/quirks/table-cell-nowrap-minimum-width-calculation.html
@@ -36,7 +36,7 @@
         s.document.close();
         [q, a, s].forEach(function(win) {
             ['style', 'test', 'ref', 's_ref'].forEach(function(id) {
-                win.__proto__.__defineGetter__(id, function() { return win.document.getElementById(id); });
+                Object.getPrototypeOf(win).__defineGetter__(id, function() { return win.document.getElementById(id); });
             });
         });
         q.title = 'quirks mode';
diff --git a/tests/wpt/web-platform-tests/quirks/table-cell-width-calculation.html b/tests/wpt/web-platform-tests/quirks/table-cell-width-calculation.html
index eeb726627b7..7d76a9194b3 100644
--- a/tests/wpt/web-platform-tests/quirks/table-cell-width-calculation.html
+++ b/tests/wpt/web-platform-tests/quirks/table-cell-width-calculation.html
@@ -36,7 +36,7 @@
         s.document.close();
         [q, a, s].forEach(function(win) {
             ['style', 'test', 'ref', 's_ref'].forEach(function(id) {
-                win.__proto__.__defineGetter__(id, function() { return win.document.getElementById(id); });
+                Object.getPrototypeOf(win).__defineGetter__(id, function() { return win.document.getElementById(id); });
             });
         });
         q.title = 'quirks mode';
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html
index e6df2098d47..491f104de4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html
@@ -45,8 +45,7 @@
 [
   {
     srcDocPolicy: ``,
-    expected: location.href  // Executing javascript does not commit a new document
-                             // and does not change the document url.
+    expected: location.href  // Executing javascript does not change the document url.
                              // Since the algorithm for computing the referrer in a srcdoc
                              // iframe defers recursively to the parent, the expected
                              // referrer should be the full url of the main document.
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html
index 356eedd4f48..5b76f8efccb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html
@@ -27,20 +27,6 @@
         document.body.appendChild(iframe);
         assert_equals(await referrer, self.origin + "/");
       }, "Srcdoc iframe inherits referrer policy from parent on creation.");
-
-      promise_test(async t => {
-        let referrer = reportedReferrer();
-
-        // We navigate the iframe to a page that will set referrer
-        // policy to 'unsafe-url' and then navigate to about:srcdoc.
-        iframe.contentWindow.location = 'resources/referrer-policy-unsafe-url-navigate-to-srcdoc.html';
-
-        // Despite the navigation was initiated by a document with
-        // referrer policy 'unsafe-url', the srcdoc iframe should
-        // still inherit the referrer policy from its parent, and
-        // not the navigation's initiator.
-        assert_equals(await referrer, self.origin + "/");
-      }, "Even after a navigation from another initiator, srcdoc iframe still inherits referrer policy from the parent.");
     </script>
     <div id="log"></div>
   </body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/referrer-policy-unsafe-url-navigate-to-srcdoc.html b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/referrer-policy-unsafe-url-navigate-to-srcdoc.html
deleted file mode 100644
index dfdfae1f0d8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/referrer-policy-unsafe-url-navigate-to-srcdoc.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="referrer" content="unsafe-url">
-  </head>
-  <body>
-    <script>
-      window.location = "about:srcdoc";
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/resources/chromium/README.md b/tests/wpt/web-platform-tests/resources/chromium/README.md
index ec953033f9b..3813f6de5d7 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/README.md
+++ b/tests/wpt/web-platform-tests/resources/chromium/README.md
@@ -2,6 +2,6 @@ This directory contains Chromium-specific test resources, including mocks for
 test-only APIs implemented with
 [MojoJS](https://chromium.googlesource.com/chromium/src/+/master/mojo/public/js/README.md).
 
-Please do **not** copy `*.mojom.js` into this directory. Follow this doc if you
+Please do **not** copy `*.mojom.m.js` into this directory. Follow this doc if you
 want to add new MojoJS-backed mocks:
 https://chromium.googlesource.com/chromium/src/+/master/docs/testing/web_platform_tests.md#mojojs
diff --git a/tests/wpt/web-platform-tests/resources/chromium/contacts_manager_mock.js b/tests/wpt/web-platform-tests/resources/chromium/contacts_manager_mock.js
index 443d50bbc62..2ace6d49ffa 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/contacts_manager_mock.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/contacts_manager_mock.js
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-'use strict';
+import {ContactsManager, ContactsManagerReceiver} from '/gen/third_party/blink/public/mojom/contacts/contacts_manager.mojom.m.js';
 
-const WebContactsTest = (() => {
+self.WebContactsTest = (() => {
   class MockContacts {
     constructor() {
-      this.bindingSet_ = new mojo.BindingSet(blink.mojom.ContactsManager);
+      this.receiver_ = new ContactsManagerReceiver(this);
 
       this.interceptor_ =
-          new MojoInterfaceInterceptor(blink.mojom.ContactsManager.name);
+          new MojoInterfaceInterceptor(ContactsManager.$interfaceName);
       this.interceptor_.oninterfacerequest =
-          e => this.bindingSet_.addBinding(this, e.handle);
+          e => this.receiver_.$.bindHandle(e.handle);
       this.interceptor_.start();
 
       this.selectedContacts_ = [];
@@ -39,7 +39,7 @@ const WebContactsTest = (() => {
         return {contacts: null};
 
       const contactInfos = await Promise.all(this.selectedContacts_.map(async contact => {
-        const contactInfo = new blink.mojom.ContactInfo();
+        const contactInfo = {};
         if (includeNames)
           contactInfo.name = contact.name || [];
         if (includeEmails)
@@ -69,7 +69,7 @@ const WebContactsTest = (() => {
     }
 
     reset() {
-      this.bindingSet_.closeAllBindings();
+      this.receiver_.$.close();
       this.interceptor_.stop();
     }
   }
diff --git a/tests/wpt/web-platform-tests/resources/chromium/fake-serial.js b/tests/wpt/web-platform-tests/resources/chromium/fake-serial.js
index 46a79f0147a..1a0f4b52178 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/fake-serial.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/fake-serial.js
@@ -1,3 +1,6 @@
+import {SerialPortFlushMode, SerialPortRemote, SerialReceiveError, SerialPortReceiver, SerialSendError} from '/gen/services/device/public/mojom/serial.mojom.m.js';
+import {SerialService, SerialServiceReceiver} from '/gen/third_party/blink/public/mojom/serial/serial.mojom.m.js';
+
 // Implementation of an UnderlyingSource to create a ReadableStream from a Mojo
 // data pipe consumer handle.
 class DataPipeSource {
@@ -84,7 +87,7 @@ class DataPipeSink {
   }
 }
 
-// Implementation of blink.mojom.SerialPort.
+// Implementation of device.mojom.SerialPort.
 class FakeSerialPort {
   constructor() {
     this.inputSignals_ = {
@@ -103,24 +106,21 @@ class FakeSerialPort {
   }
 
   open(options, client) {
-    if (this.binding_ !== undefined) {
+    if (this.receiver_ !== undefined) {
       // Port already open.
       return null;
     }
 
-    let portPtr = new device.mojom.SerialPortPtr();
-    this.binding_ = new mojo.Binding(
-        device.mojom.SerialPort, this, mojo.makeRequest(portPtr));
-    this.binding_.setConnectionErrorHandler(() => {
-      this.close();
-    });
+    let port = new SerialPortRemote();
+    this.receiver_ = new SerialPortReceiver(this);
+    this.receiver_.$.bindHandle(port.$.bindNewPipeAndPassReceiver().handle);
 
     this.options_ = options;
     this.client_ = client;
     // OS typically sets DTR on open.
     this.outputSignals_.dataTerminalReady = true;
 
-    return portPtr;
+    return port;
   }
 
   write(data) {
@@ -146,11 +146,11 @@ class FakeSerialPort {
   }
 
   simulateParityError() {
-    this.simulateReadError(device.mojom.SerialReceiveError.PARITY_ERROR);
+    this.simulateReadError(SerialReceiveError.PARITY_ERROR);
   }
 
   simulateDisconnectOnRead() {
-    this.simulateReadError(device.mojom.SerialReceiveError.DISCONNECTED);
+    this.simulateReadError(SerialReceiveError.DISCONNECTED);
   }
 
   simulateWriteError(error) {
@@ -161,11 +161,11 @@ class FakeSerialPort {
   }
 
   simulateSystemErrorOnWrite() {
-    this.simulateWriteError(device.mojom.SerialSendError.SYSTEM_ERROR);
+    this.simulateWriteError(SerialSendError.SYSTEM_ERROR);
   }
 
   simulateDisconnectOnWrite() {
-    this.simulateWriteError(device.mojom.SerialSendError.DISCONNECTED);
+    this.simulateWriteError(SerialSendError.DISCONNECTED);
   }
 
   simulateInputSignals(signals) {
@@ -232,13 +232,13 @@ class FakeSerialPort {
 
   async flush(mode) {
     switch (mode) {
-      case device.mojom.SerialPortFlushMode.kReceive:
+      case SerialPortFlushMode.kReceive:
         this.writer_.abort();
         this.writer_.releaseLock();
         this.writer_ = undefined;
         this.writable_ = undefined;
         break;
-      case device.mojom.SerialPortFlushMode.kTransmit:
+      case SerialPortFlushMode.kTransmit:
         this.reader_.cancel();
         this.reader_ = undefined;
         this.readable_ = undefined;
@@ -289,11 +289,11 @@ class FakeSerialPort {
   async getPortInfo() {
     return {
       bitrate: this.options_.bitrate,
-      data_bits: this.options_.data_bits,
-      parity_bit: this.options_.parity_bit,
-      stop_bits: this.options_.stop_bits,
-      cts_flow_control: this.options_.has_cts_flow_control ?
-          this.options_.cts_flow_control : false
+      dataBits: this.options_.datBits,
+      parityBit: this.options_.parityBit,
+      stopBits: this.options_.stopBits,
+      ctsFlowControl:
+          this.options_.hasCtsFlowControl && this.options_.ctsFlowControl,
     };
   }
 
@@ -307,9 +307,9 @@ class FakeSerialPort {
     }
     this.writable_ = undefined;
 
-    if (this.binding_) {
-      this.binding_.close();
-      this.binding_ = undefined;
+    if (this.receiver_) {
+      this.receiver_.$.close();
+      this.receiver_ = undefined;
     }
     return {};
   }
@@ -319,9 +319,9 @@ class FakeSerialPort {
 class FakeSerialService {
   constructor() {
     this.interceptor_ =
-        new MojoInterfaceInterceptor(blink.mojom.SerialService.name);
+        new MojoInterfaceInterceptor(SerialService.$interfaceName);
     this.interceptor_.oninterfacerequest = e => this.bind(e.handle);
-    this.bindingSet_ = new mojo.BindingSet(blink.mojom.SerialService);
+    this.receiver_ = new SerialServiceReceiver(this);
     this.clients_ = [];
     this.nextToken_ = 0;
     this.reset();
@@ -341,7 +341,7 @@ class FakeSerialService {
   }
 
   addPort(info) {
-    let portInfo = new blink.mojom.SerialPortInfo();
+    let portInfo = {};
     if (info?.usbVendorId !== undefined) {
       portInfo.hasUsbVendorId = true;
       portInfo.usbVendorId = info.usbVendorId;
@@ -352,9 +352,7 @@ class FakeSerialService {
     }
 
     let token = ++this.nextToken_;
-    portInfo.token = new mojoBase.mojom.UnguessableToken();
-    portInfo.token.high = 0;
-    portInfo.token.low = token;
+    portInfo.token = {high: 0n, low: BigInt(token)};
 
     let record = {
       portInfo: portInfo,
@@ -394,7 +392,7 @@ class FakeSerialService {
   }
 
   bind(handle) {
-    this.bindingSet_.addBinding(this, handle);
+    this.receiver_.$.bindHandle(handle);
   }
 
   async setClient(client_remote) {
@@ -415,7 +413,7 @@ class FakeSerialService {
   }
 
   async openPort(token, options, client) {
-    let record = this.ports_.get(token.low);
+    let record = this.ports_.get(Number(token.low));
     if (record !== undefined) {
       return {port: record.fakePort.open(options, client)};
     } else {
@@ -424,4 +422,4 @@ class FakeSerialService {
   }
 }
 
-fakeSerialService = new FakeSerialService();
+export const fakeSerialService = new FakeSerialService();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js b/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js
index 56438824518..b7b303b6f14 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js
@@ -1,9 +1,10 @@
-'use strict';
+import {ReportingMode, Sensor, SensorClientRemote, SensorReceiver, SensorRemote, SensorType} from '/gen/services/device/public/mojom/sensor.mojom.m.js';
+import {SensorCreationResult, SensorInitParams_READ_BUFFER_SIZE_FOR_TESTS, SensorProvider, SensorProviderReceiver} from '/gen/services/device/public/mojom/sensor_provider.mojom.m.js';
 
 // A "sliding window" that iterates over |data| and returns one item at a
 // time, advancing and wrapping around as needed. |data| must be an array of
 // arrays.
-class RingBuffer {
+self.RingBuffer = class {
   constructor(data) {
     this.bufferPosition_ = 0;
     // Validate |data|'s format and deep-copy every element.
@@ -28,9 +29,9 @@ class RingBuffer {
   [Symbol.iterator]() {
     return this;
   }
-}
+};
 
-var GenericSensorTest = (() => {
+self.GenericSensorTest = (() => {
   // Default sensor frequency in default configurations.
   const DEFAULT_FREQUENCY = 5;
 
@@ -56,11 +57,8 @@ var GenericSensorTest = (() => {
       }
       this.buffer_ = new Float64Array(rv.buffer);
       this.buffer_.fill(0);
-      this.binding_ = new mojo.Binding(device.mojom.Sensor, this,
-                                       sensorRequest);
-      this.binding_.setConnectionErrorHandler(() => {
-        this.reset();
-      });
+      this.receiver_ = new SensorReceiver(this);
+      this.receiver_.$.bindHandle(sensorRequest.handle);
     }
 
     // Returns default configuration.
@@ -120,7 +118,7 @@ var GenericSensorTest = (() => {
       this.notifyOnReadingChange_ = true;
       this.readingData_ = null;
       this.buffer_.fill(0);
-      this.binding_.close();
+      this.receiver_.$.close();
     }
 
     // Sets fake data that is used to deliver sensor reading updates.
@@ -166,7 +164,7 @@ var GenericSensorTest = (() => {
         // increasing timestamp.
         this.buffer_[1] = this.timestamp_++;
 
-        if (this.reportingMode_ === device.mojom.ReportingMode.ON_CHANGE &&
+        if (this.reportingMode_ === ReportingMode.ON_CHANGE &&
             this.notifyOnReadingChange_) {
           this.client_.sensorReadingChanged();
         }
@@ -197,9 +195,9 @@ var GenericSensorTest = (() => {
   class MockSensorProvider {
     constructor() {
       this.readingSizeInBytes_ =
-          device.mojom.SensorInitParams.READ_BUFFER_SIZE_FOR_TESTS;
-      this.sharedBufferSizeInBytes_ = this.readingSizeInBytes_ *
-              (device.mojom.SensorType.MAX_VALUE + 1);
+          Number(SensorInitParams_READ_BUFFER_SIZE_FOR_TESTS);
+      this.sharedBufferSizeInBytes_ =
+          this.readingSizeInBytes_ * (SensorType.MAX_VALUE + 1);
       const rv = Mojo.createSharedBuffer(this.sharedBufferSizeInBytes_);
       if (rv.result != Mojo.RESULT_OK) {
         throw new Error("MockSensorProvider: Failed to map shared buffer");
@@ -212,28 +210,26 @@ var GenericSensorTest = (() => {
       this.maxFrequency_ = 60;
       this.minFrequency_ = 1;
       this.mojomSensorType_ = new Map([
-        ['Accelerometer', device.mojom.SensorType.ACCELEROMETER],
-        ['LinearAccelerationSensor',
-            device.mojom.SensorType.LINEAR_ACCELERATION],
-        ['GravitySensor',
-            device.mojom.SensorType.GRAVITY],
-        ['AmbientLightSensor', device.mojom.SensorType.AMBIENT_LIGHT],
-        ['Gyroscope', device.mojom.SensorType.GYROSCOPE],
-        ['Magnetometer', device.mojom.SensorType.MAGNETOMETER],
+        ['Accelerometer', SensorType.ACCELEROMETER],
+        ['LinearAccelerationSensor', SensorType.LINEAR_ACCELERATION],
+        ['GravitySensor', SensorType.GRAVITY],
+        ['AmbientLightSensor', SensorType.AMBIENT_LIGHT],
+        ['Gyroscope', SensorType.GYROSCOPE],
+        ['Magnetometer', SensorType.MAGNETOMETER],
         ['AbsoluteOrientationSensor',
-            device.mojom.SensorType.ABSOLUTE_ORIENTATION_QUATERNION],
+            SensorType.ABSOLUTE_ORIENTATION_QUATERNION],
         ['AbsoluteOrientationEulerAngles',
-            device.mojom.SensorType.ABSOLUTE_ORIENTATION_EULER_ANGLES],
+            SensorType.ABSOLUTE_ORIENTATION_EULER_ANGLES],
         ['RelativeOrientationSensor',
-            device.mojom.SensorType.RELATIVE_ORIENTATION_QUATERNION],
+            SensorType.RELATIVE_ORIENTATION_QUATERNION],
         ['RelativeOrientationEulerAngles',
-            device.mojom.SensorType.RELATIVE_ORIENTATION_EULER_ANGLES],
-        ['ProximitySensor', device.mojom.SensorType.PROXIMITY]
+            SensorType.RELATIVE_ORIENTATION_EULER_ANGLES],
+        ['ProximitySensor', SensorType.PROXIMITY]
       ]);
-      this.binding_ = new mojo.Binding(device.mojom.SensorProvider, this);
+      this.receiver_ = new SensorProviderReceiver(this);
 
       this.interceptor_ =
-          new MojoInterfaceInterceptor(device.mojom.SensorProvider.name);
+          new MojoInterfaceInterceptor(SensorProvider.$interfaceName);
       this.interceptor_.oninterfacerequest = e => {
         this.bindToPipe(e.handle);
       };
@@ -243,25 +239,24 @@ var GenericSensorTest = (() => {
     // Returns initialized Sensor proxy to the client.
     async getSensor(type) {
       if (this.getSensorShouldFail_.get(type)) {
-        return {result: device.mojom.SensorCreationResult.ERROR_NOT_AVAILABLE,
+        return {result: SensorCreationResult.ERROR_NOT_AVAILABLE,
                 initParams: null};
       }
       if (this.permissionsDenied_.get(type)) {
-        return {result: device.mojom.SensorCreationResult.ERROR_NOT_ALLOWED,
+        return {result: SensorCreationResult.ERROR_NOT_ALLOWED,
                 initParams: null};
       }
 
       const offset = type * this.readingSizeInBytes_;
-      const reportingMode = device.mojom.ReportingMode.ON_CHANGE;
+      const reportingMode = ReportingMode.ON_CHANGE;
 
-      const sensorPtr = new device.mojom.SensorPtr();
+      const sensor = new SensorRemote();
       if (!this.activeSensors_.has(type)) {
         const mockSensor = new MockSensor(
-            mojo.makeRequest(sensorPtr), this.sharedBufferHandle_, offset,
-            this.readingSizeInBytes_, reportingMode);
+            sensor.$.bindNewPipeAndPassReceiver(), this.sharedBufferHandle_,
+            offset, this.readingSizeInBytes_, reportingMode);
         this.activeSensors_.set(type, mockSensor);
-        this.activeSensors_.get(type).client_ =
-            new device.mojom.SensorClientPtr();
+        this.activeSensors_.get(type).client_ = new SensorClientRemote();
       }
 
       const rv = this.sharedBufferHandle_.duplicateBufferHandle();
@@ -272,8 +267,7 @@ var GenericSensorTest = (() => {
       const defaultConfig = { frequency: DEFAULT_FREQUENCY };
       // Consider sensor traits to meet assertions in C++ code (see
       // services/device/public/cpp/generic_sensor/sensor_traits.h)
-      if (type == device.mojom.SensorType.AMBIENT_LIGHT ||
-          type == device.mojom.SensorType.MAGNETOMETER) {
+      if (type == SensorType.AMBIENT_LIGHT || type == SensorType.MAGNETOMETER) {
         this.maxFrequency_ = Math.min(10, this.maxFrequency_);
       }
 
@@ -283,23 +277,24 @@ var GenericSensorTest = (() => {
       // each reading return a different value that is significantly different
       // from the previous one when setSensorReading() is not called by client
       // code (e.g. run_generic_sensor_iframe_tests()).
-      if (type == device.mojom.SensorType.AMBIENT_LIGHT) {
+      if (type == SensorType.AMBIENT_LIGHT) {
         this.activeSensors_.get(type).setSensorReading([
           [window.performance.now() * 100],
           [(window.performance.now() + 50) * 100]
         ]);
       }
 
-      const initParams = new device.mojom.SensorInitParams({
-        sensor: sensorPtr,
-        clientReceiver: mojo.makeRequest(this.activeSensors_.get(type).client_),
+      const client = this.activeSensors_.get(type).client_;
+      const initParams = {
+        sensor,
+        clientReceiver: client.$.bindNewPipeAndPassReceiver(),
         memory: rv.handle,
-        bufferOffset: offset,
+        bufferOffset: BigInt(offset),
         mode: reportingMode,
         defaultConfiguration: defaultConfig,
         minimumFrequency: this.minFrequency_,
         maximumFrequency: this.maxFrequency_
-      });
+      };
 
       if (this.resolveFuncs_.has(type)) {
         for (let resolveFunc of this.resolveFuncs_.get(type)) {
@@ -308,16 +303,12 @@ var GenericSensorTest = (() => {
         this.resolveFuncs_.delete(type);
       }
 
-      return {result: device.mojom.SensorCreationResult.SUCCESS,
-              initParams: initParams};
+      return {result: SensorCreationResult.SUCCESS, initParams};
     }
 
     // Binds object to mojo message pipe
     bindToPipe(pipe) {
-      this.binding_.bind(pipe);
-      this.binding_.setConnectionErrorHandler(() => {
-        this.reset();
-      });
+      this.receiver_.$.bindHandle(pipe);
     }
 
     // Mock functions
@@ -333,7 +324,7 @@ var GenericSensorTest = (() => {
       this.permissionsDenied_.clear();
       this.maxFrequency_ = 60;
       this.minFrequency_ = 1;
-      this.binding_.close();
+      this.receiver_.$.close();
       this.interceptor_.stop();
     }
 
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-barcodedetection.js b/tests/wpt/web-platform-tests/resources/chromium/mock-barcodedetection.js
index c11f879b5b6..b0d2e0af0ae 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/mock-barcodedetection.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/mock-barcodedetection.js
@@ -1,20 +1,20 @@
-"use strict";
+import {BarcodeDetectionReceiver, BarcodeFormat} from '/gen/services/shape_detection/public/mojom/barcodedetection.mojom.m.js';
+import {BarcodeDetectionProvider, BarcodeDetectionProviderReceiver} from '/gen/services/shape_detection/public/mojom/barcodedetection_provider.mojom.m.js';
 
-var BarcodeDetectionTest = (() => {
+self.BarcodeDetectionTest = (() => {
   // Class that mocks BarcodeDetectionProvider interface defined in
   // https://cs.chromium.org/chromium/src/services/shape_detection/public/mojom/barcodedetection_provider.mojom
   class MockBarcodeDetectionProvider {
     constructor() {
-      this.bindingSet_ = new mojo.BindingSet(
-          shapeDetection.mojom.BarcodeDetectionProvider);
+      this.receiver_ = new BarcodeDetectionProviderReceiver(this);
 
       this.interceptor_ = new MojoInterfaceInterceptor(
-          shapeDetection.mojom.BarcodeDetectionProvider.name);
+          BarcodeDetectionProvider.$interfaceName);
       this.interceptor_.oninterfacerequest = e => {
         if (this.should_close_pipe_on_request_)
           e.handle.close();
         else
-          this.bindingSet_.addBinding(this, e.handle);
+          this.receiver_.$.bindHandle(e.handle);
       }
       this.interceptor_.start();
       this.should_close_pipe_on_request_ = false;
@@ -25,13 +25,13 @@ var BarcodeDetectionTest = (() => {
     }
 
     enumerateSupportedFormats() {
-      return Promise.resolve({
+      return {
         supportedFormats: [
-          shapeDetection.mojom.BarcodeFormat.AZTEC,
-          shapeDetection.mojom.BarcodeFormat.DATA_MATRIX,
-          shapeDetection.mojom.BarcodeFormat.QR_CODE,
+          BarcodeFormat.AZTEC,
+          BarcodeFormat.DATA_MATRIX,
+          BarcodeFormat.QR_CODE,
         ]
-      });
+      };
     }
 
     getFrameData() {
@@ -45,7 +45,7 @@ var BarcodeDetectionTest = (() => {
     reset() {
       this.mockService_ = null;
       this.should_close_pipe_on_request_ = false;
-      this.bindingSet_.closeAllBindings();
+      this.receiver_.$.close();
       this.interceptor_.stop();
     }
 
@@ -60,20 +60,19 @@ var BarcodeDetectionTest = (() => {
   class MockBarcodeDetection {
     constructor(request, options) {
       this.options_ = options;
-      this.binding_ =
-          new mojo.Binding(shapeDetection.mojom.BarcodeDetection,
-                           this, request);
+      this.receiver_ = new BarcodeDetectionReceiver(this);
+      this.receiver_.$.bindHandle(request.handle);
     }
 
     detect(bitmapData) {
       this.bufferData_ =
           new Uint32Array(getArrayBufferFromBigBuffer(bitmapData.pixelData));
-      return Promise.resolve({
+      return {
         results: [
           {
             rawValue : "cats",
             boundingBox: { x: 1.0, y: 1.0, width: 100.0, height: 100.0 },
-            format: shapeDetection.mojom.BarcodeFormat.QR_CODE,
+            format: BarcodeFormat.QR_CODE,
             cornerPoints: [
               { x: 1.0, y: 1.0 },
               { x: 101.0, y: 1.0 },
@@ -84,7 +83,7 @@ var BarcodeDetectionTest = (() => {
           {
             rawValue : "dogs",
             boundingBox: { x: 2.0, y: 2.0, width: 50.0, height: 50.0 },
-            format: shapeDetection.mojom.BarcodeFormat.CODE_128,
+            format: BarcodeFormat.CODE_128,
             cornerPoints: [
               { x: 2.0, y: 2.0 },
               { x: 52.0, y: 2.0 },
@@ -93,7 +92,7 @@ var BarcodeDetectionTest = (() => {
             ],
           },
         ],
-      });
+      };
     }
   }
 
@@ -133,3 +132,5 @@ var BarcodeDetectionTest = (() => {
 
   return BarcodeDetectionTestChromium;
 })();
+
+self.BarcodeFormat = BarcodeFormat;
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-facedetection.js b/tests/wpt/web-platform-tests/resources/chromium/mock-facedetection.js
index 1275e4dd2f5..7ae658621ee 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/mock-facedetection.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/mock-facedetection.js
@@ -1,17 +1,17 @@
-"use strict";
+import {FaceDetectionReceiver, LandmarkType} from '/gen/services/shape_detection/public/mojom/facedetection.mojom.m.js';
+import {FaceDetectionProvider, FaceDetectionProviderReceiver} from '/gen/services/shape_detection/public/mojom/facedetection_provider.mojom.m.js';
 
-var FaceDetectionTest = (() => {
+self.FaceDetectionTest = (() => {
   // Class that mocks FaceDetectionProvider interface defined in
   // https://cs.chromium.org/chromium/src/services/shape_detection/public/mojom/facedetection_provider.mojom
   class MockFaceDetectionProvider {
     constructor() {
-      this.bindingSet_ = new mojo.BindingSet(
-        shapeDetection.mojom.FaceDetectionProvider);
+      this.receiver_ = new FaceDetectionProviderReceiver(this);
 
       this.interceptor_ = new MojoInterfaceInterceptor(
-          shapeDetection.mojom.FaceDetectionProvider.name);
+          FaceDetectionProvider.$interfaceName);
       this.interceptor_.oninterfacerequest =
-         e => this.bindingSet_.addBinding(this, e.handle);
+         e => this.receiver_.$.bindHandle(e.handle);
       this.interceptor_.start();
     }
 
@@ -33,7 +33,7 @@ var FaceDetectionTest = (() => {
 
     reset() {
       this.mockService_ = null;
-      this.bindingSet_.closeAllBindings();
+      this.receiver_.$.close();
       this.interceptor_.stop();
     }
   }
@@ -44,9 +44,8 @@ var FaceDetectionTest = (() => {
     constructor(request, options) {
       this.maxDetectedFaces_ = options.maxDetectedFaces;
       this.fastMode_ = options.fastMode;
-      this.binding_ =
-          new mojo.Binding(shapeDetection.mojom.FaceDetection,
-                           this, request);
+      this.receiver_ = new FaceDetectionReceiver(this);
+      this.receiver_.$.bindHandle(request.handle);
     }
 
     detect(bitmapData) {
@@ -57,11 +56,11 @@ var FaceDetectionTest = (() => {
           {
             boundingBox: {x: 1.0, y: 1.0, width: 100.0, height: 100.0},
             landmarks: [{
-              type: shapeDetection.mojom.LandmarkType.EYE,
+              type: LandmarkType.EYE,
               locations: [{x: 4.0, y: 5.0}]
             },
             {
-              type: shapeDetection.mojom.LandmarkType.EYE,
+              type: LandmarkType.EYE,
               locations: [
                 {x: 4.0, y: 5.0}, {x: 5.0, y: 4.0}, {x: 6.0, y: 3.0},
                 {x: 7.0, y: 4.0}, {x: 8.0, y: 5.0}, {x: 7.0, y: 6.0},
@@ -72,11 +71,11 @@ var FaceDetectionTest = (() => {
           {
             boundingBox: {x: 2.0, y: 2.0, width: 200.0, height: 200.0},
             landmarks: [{
-              type: shapeDetection.mojom.LandmarkType.NOSE,
+              type: LandmarkType.NOSE,
               locations: [{x: 100.0, y: 50.0}]
             },
             {
-              type: shapeDetection.mojom.LandmarkType.NOSE,
+              type: LandmarkType.NOSE,
               locations: [
                 {x: 80.0, y: 50.0}, {x: 70.0, y: 60.0}, {x: 60.0, y: 70.0},
                 {x: 70.0, y: 60.0}, {x: 80.0, y: 70.0}, {x: 90.0, y: 80.0},
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-idle-detection.js b/tests/wpt/web-platform-tests/resources/chromium/mock-idle-detection.js
index d88d1ad1c55..afc5b93f500 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/mock-idle-detection.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/mock-idle-detection.js
@@ -1,3 +1,5 @@
+import {IdleManager, IdleManagerReceiver, ScreenIdleState as MojoScreenIdleState, UserIdleState as MojoUserIdleState} from '/gen/third_party/blink/public/mojom/idle/idle_manager.mojom.m.js';
+
 /**
  * This is a testing framework that enables us to test the user idle detection
  * by intercepting the connection between the renderer and the browser and
@@ -35,14 +37,14 @@ class FakeIdleMonitor {
     return this;
   }
   close() {
-    this.binding.close();
+    this.binding.$.close();
   }
 }
 
-const UserIdleState = {};
-const ScreenIdleState = {};
+self.UserIdleState = {};
+self.ScreenIdleState = {};
 
-function addMonitor(threshold, monitorPtr, callback) {
+self.addMonitor = function addMonitor(threshold, monitorPtr, callback) {
   throw new Error("expected to be overriden by tests");
 }
 
@@ -50,34 +52,31 @@ async function close() {
   interceptor.close();
 }
 
-function expect(call) {
+self.expect = function(call) {
   return {
     andReturn(callback) {
       let handler = {};
       handler[call.name] = callback;
       interceptor.setHandler(handler);
     }
-  }
-}
+  };
+};
 
 function intercept() {
   let result = new FakeIdleMonitor();
 
-  let binding = new mojo.Binding(blink.mojom.IdleManager, result);
-  let interceptor = new MojoInterfaceInterceptor(blink.mojom.IdleManager.name);
-  interceptor.oninterfacerequest = (e) => {
-    binding.bind(e.handle);
-  }
-
+  let binding = new IdleManagerReceiver(result);
+  let interceptor = new MojoInterfaceInterceptor(IdleManager.$interfaceName);
+  interceptor.oninterfacerequest = e => binding.$.bindHandle(e.handle);
   interceptor.start();
 
-  UserIdleState.ACTIVE = blink.mojom.UserIdleState.kActive;
-  UserIdleState.IDLE = blink.mojom.UserIdleState.kIdle;
-  ScreenIdleState.LOCKED = blink.mojom.ScreenIdleState.kLocked;
-  ScreenIdleState.UNLOCKED = blink.mojom.ScreenIdleState.kUnlocked;
+  self.UserIdleState.ACTIVE = MojoUserIdleState.kActive;
+  self.UserIdleState.IDLE = MojoUserIdleState.kIdle;
+  self.ScreenIdleState.LOCKED = MojoScreenIdleState.kLocked;
+  self.ScreenIdleState.UNLOCKED = MojoScreenIdleState.kUnlocked;
 
   result.setBinding(binding);
   return result;
 }
 
-const interceptor = intercept();
\ No newline at end of file
+const interceptor = intercept();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-imagecapture.js b/tests/wpt/web-platform-tests/resources/chromium/mock-imagecapture.js
index a8f5c896b1f..97d45d453bd 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/mock-imagecapture.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/mock-imagecapture.js
@@ -1,34 +1,34 @@
-"use strict";
+import {FillLightMode, ImageCapture, ImageCaptureReceiver, MeteringMode, RedEyeReduction} from '/gen/media/capture/mojom/image_capture.mojom.m.js';
 
-var ImageCaptureTest = (() => {
+self.ImageCaptureTest = (() => {
   // Class that mocks ImageCapture interface defined in
   // https://cs.chromium.org/chromium/src/media/capture/mojom/image_capture.mojom
   class MockImageCapture {
     constructor() {
       this.interceptor_ =
-          new MojoInterfaceInterceptor(media.mojom.ImageCapture.name);
+          new MojoInterfaceInterceptor(ImageCapture.$interfaceName);
       this.interceptor_.oninterfacerequest =
-        e => this.bindingSet_.addBinding(this, e.handle);
+        e => this.receiver_.$.bindHandle(e.handle);
       this.interceptor_.start();
 
       this.state_ = {
         state: {
           supportedWhiteBalanceModes: [
-            media.mojom.MeteringMode.SINGLE_SHOT,
-            media.mojom.MeteringMode.CONTINUOUS
+            MeteringMode.SINGLE_SHOT,
+            MeteringMode.CONTINUOUS
           ],
-          currentWhiteBalanceMode: media.mojom.MeteringMode.CONTINUOUS,
+          currentWhiteBalanceMode: MeteringMode.CONTINUOUS,
           supportedExposureModes: [
-            media.mojom.MeteringMode.MANUAL,
-            media.mojom.MeteringMode.SINGLE_SHOT,
-            media.mojom.MeteringMode.CONTINUOUS
+            MeteringMode.MANUAL,
+            MeteringMode.SINGLE_SHOT,
+            MeteringMode.CONTINUOUS
           ],
-          currentExposureMode: media.mojom.MeteringMode.MANUAL,
+          currentExposureMode: MeteringMode.MANUAL,
           supportedFocusModes: [
-            media.mojom.MeteringMode.MANUAL,
-            media.mojom.MeteringMode.SINGLE_SHOT
+            MeteringMode.MANUAL,
+            MeteringMode.SINGLE_SHOT
           ],
-          currentFocusMode: media.mojom.MeteringMode.MANUAL,
+          currentFocusMode: MeteringMode.MANUAL,
           pointsOfInterest: [{
             x: 0.4,
             y: 0.6
@@ -115,7 +115,7 @@ var ImageCaptureTest = (() => {
           supportsTorch: true,
           torch: false,
 
-          redEyeReduction: media.mojom.RedEyeReduction.CONTROLLABLE,
+          redEyeReduction: RedEyeReduction.CONTROLLABLE,
           height: {
             min: 240.0,
             max: 2448.0,
@@ -128,18 +128,16 @@ var ImageCaptureTest = (() => {
             current: 320.0,
             step: 3.0
           },
-          fillLightMode: [
-            media.mojom.FillLightMode.AUTO, media.mojom.FillLightMode.FLASH
-          ],
+          fillLightMode: [FillLightMode.AUTO, FillLightMode.FLASH],
         }
       };
       this.panTiltZoomPermissionStatus_ = null;
       this.settings_ = null;
-      this.bindingSet_ = new mojo.BindingSet(media.mojom.ImageCapture);
+      this.receiver_ = new ImageCaptureReceiver(this);
     }
 
     reset() {
-      this.bindingSet_.closeAllBindings();
+      this.receiver_.$.close();
       this.interceptor_.stop();
     }
 
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-screenenumeration.js b/tests/wpt/web-platform-tests/resources/chromium/mock-screenenumeration.js
index 2e41f59ea80..fc89b11ea10 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/mock-screenenumeration.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/mock-screenenumeration.js
@@ -1,14 +1,27 @@
-'use strict'
+import {MultipleDisplays, ScreenEnumeration, ScreenEnumerationReceiver} from '/gen/third_party/blink/public/mojom/screen_enumeration/screen_enumeration.mojom.m.js';
+import {BufferFormat} from '/gen/ui/gfx/mojom/buffer_types.mojom.m.js';
+import {ColorSpaceMatrixID, ColorSpacePrimaryID, ColorSpaceRangeID, ColorSpaceTransferID} from '/gen/ui/gfx/mojom/color_space.mojom.m.js';
+import {AccelerometerSupport, Rotation, TouchSupport} from '/gen/ui/display/mojom/display.mojom.m.js';
 
-var ScreenEnumerationTest = (() => {
+export const HelperTypes = {
+  AccelerometerSupport,
+  BufferFormat,
+  ColorSpaceMatrixID,
+  ColorSpacePrimaryID,
+  ColorSpaceRangeID,
+  ColorSpaceTransferID,
+  Rotation,
+  TouchSupport,
+};
 
+self.ScreenEnumerationTest = (() => {
   class MockScreenEnumeration {
     constructor() {
-      this.bindingSet_ = new mojo.BindingSet(blink.mojom.ScreenEnumeration);
-      this.interceptor_ = new MojoInterfaceInterceptor(blink.mojom.ScreenEnumeration.name);
-      this.interceptor_.oninterfacerequest = e => {
-        this.bindingSet_.addBinding(this, e.handle);
-      }
+      this.receiver_ = new ScreenEnumerationReceiver(this);
+      this.interceptor_ =
+          new MojoInterfaceInterceptor(ScreenEnumeration.$interfaceName);
+      this.interceptor_.oninterfacerequest =
+          e => this.receiver_.$.bindHandle(e.handle);
       this.reset();
       this.interceptor_.start();
     }
@@ -45,22 +58,22 @@ var ScreenEnumerationTest = (() => {
 
     async getDisplays() {
       if (!this.success_)
-        return Promise.resolve({ result: undefined, });
-      let value = new blink.mojom.Displays();
-      value.displays = this.displays_;
-      value.internalId = this.internalId_;
-      value.primaryId = this.primaryId_;
-      return Promise.resolve({ result: value, });
+        return {result: undefined};
+      const result = {
+        displays: this.displays_,
+        internalId: this.internalId_,
+        primaryId: this.primaryId_,
+      };
+      return {result};
     }
 
-    async hasMultipleDisplays() {
+    hasMultipleDisplays() {
       if (!this.success_)
-        return Promise.resolve({ result: blink.mojom.MultipleDisplays.kError });
-      return Promise.resolve({
+        return {result: MultipleDisplays.kError};
+      return {
         result: this.displays_.length > 1
-            ? blink.mojom.MultipleDisplays.kTrue
-            : blink.mojom.MultipleDisplays.kFalse,
-      });
+            ? MultipleDisplays.kTrue : MultipleDisplays.kFalse,
+      };
     }
   }
 
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-textdetection.js b/tests/wpt/web-platform-tests/resources/chromium/mock-textdetection.js
index 427ce38da21..52ca987e286 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/mock-textdetection.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/mock-textdetection.js
@@ -1,16 +1,15 @@
-"use strict";
-var TextDetectionTest = (() => {
+import {TextDetection, TextDetectionReceiver} from '/gen/services/shape_detection/public/mojom/textdetection.mojom.m.js';
+
+self.TextDetectionTest = (() => {
   // Class that mocks TextDetection interface defined in
   // https://cs.chromium.org/chromium/src/services/shape_detection/public/mojom/textdetection.mojom
   class MockTextDetection {
     constructor() {
-      this.bindingSet_ =
-          new mojo.BindingSet(shapeDetection.mojom.TextDetection);
-
+      this.receiver_ = new TextDetectionReceiver(this);
       this.interceptor_ =
-          new MojoInterfaceInterceptor(shapeDetection.mojom.TextDetection.name);
+          new MojoInterfaceInterceptor(TextDetection.$interfaceName);
       this.interceptor_.oninterfacerequest =
-          e => this.bindingSet_.addBinding(this, e.handle);
+          e => this.receiver_.$.bindHandle(e.handle);
       this.interceptor_.start();
     }
 
@@ -48,7 +47,7 @@ var TextDetectionTest = (() => {
     }
 
     reset() {
-      this.bindingSet_.closeAllBindings();
+      this.receiver_.$.close();
       this.interceptor_.stop();
     }
 
diff --git a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
index 2665f3db6b3..6a0437a7975 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
@@ -1,10 +1,9 @@
-'use strict';
+import {NDEFErrorType, NDEFRecordTypeCategory, NFC, NFCReceiver} from '/gen/services/device/public/mojom/nfc.mojom.m.js';
 
 // Converts between NDEFMessageInit https://w3c.github.io/web-nfc/#dom-ndefmessage
 // and mojom.NDEFMessage structure, so that watch function can be tested.
 function toMojoNDEFMessage(message) {
-  let ndefMessage = new device.mojom.NDEFMessage();
-  ndefMessage.data = [];
+  let ndefMessage = {data: []};
   for (let record of message.records) {
     ndefMessage.data.push(toMojoNDEFRecord(record));
   }
@@ -12,16 +11,16 @@ function toMojoNDEFMessage(message) {
 }
 
 function toMojoNDEFRecord(record) {
-  let nfcRecord = new device.mojom.NDEFRecord();
+  let nfcRecord = {};
   // Simply checks the existence of ':' to decide whether it's an external
   // type or a local type. As a mock, no need to really implement the validation
   // algorithms for them.
   if (record.recordType.startsWith(':')) {
-    nfcRecord.category = device.mojom.NDEFRecordTypeCategory.kLocal;
+    nfcRecord.category = NDEFRecordTypeCategory.kLocal;
   } else if (record.recordType.search(':') != -1) {
-    nfcRecord.category = device.mojom.NDEFRecordTypeCategory.kExternal;
+    nfcRecord.category = NDEFRecordTypeCategory.kExternal;
   } else {
-    nfcRecord.category = device.mojom.NDEFRecordTypeCategory.kStandardized;
+    nfcRecord.category = NDEFRecordTypeCategory.kStandardized;
   }
   nfcRecord.recordType = record.recordType;
   nfcRecord.mediaType = record.mediaType;
@@ -59,7 +58,7 @@ function toByteArray(data) {
 // Compares NDEFRecords that were provided / received by the mock service.
 // TODO: Use different getters to get received record data,
 // see spec changes at https://github.com/w3c/web-nfc/pull/243.
-function compareNDEFRecords(providedRecord, receivedRecord) {
+self.compareNDEFRecords = function(providedRecord, receivedRecord) {
   assert_equals(providedRecord.recordType, receivedRecord.recordType);
 
   if (providedRecord.id === undefined) {
@@ -93,7 +92,7 @@ function compareNDEFRecords(providedRecord, receivedRecord) {
 
 // Compares NDEFWriteOptions structures that were provided to API and
 // received by the mock mojo service.
-function assertNDEFWriteOptionsEqual(provided, received) {
+self.assertNDEFWriteOptionsEqual = function(provided, received) {
   if (provided.overwrite !== undefined)
     assert_equals(provided.overwrite, !!received.overwrite);
   else
@@ -102,7 +101,7 @@ function assertNDEFWriteOptionsEqual(provided, received) {
 
 // Compares NDEFReaderOptions structures that were provided to API and
 // received by the mock mojo service.
-function assertNDEFReaderOptionsEqual(provided, received) {
+self.assertNDEFReaderOptionsEqual = function(provided, received) {
   if (provided.url !== undefined)
     assert_equals(provided.url, received.url);
   else
@@ -119,24 +118,20 @@ function assertNDEFReaderOptionsEqual(provided, received) {
 }
 
 function createNDEFError(type) {
-  return {
-    error: type != null ?
-        new device.mojom.NDEFError({errorType: type, errorMessage: ''}) :
-        null
-  };
+  return {error: (type != null ? {errorType: type, errorMessage: ''} : null)};
 }
 
-var WebNFCTest = (() => {
+self.WebNFCTest = (() => {
   class MockNFC {
     constructor() {
-      this.bindingSet_ = new mojo.BindingSet(device.mojom.NFC);
+      this.receiver_ = new NFCReceiver(this);
 
-      this.interceptor_ = new MojoInterfaceInterceptor(device.mojom.NFC.name);
+      this.interceptor_ = new MojoInterfaceInterceptor(NFC.$interfaceName);
       this.interceptor_.oninterfacerequest = e => {
         if (this.should_close_pipe_on_request_)
           e.handle.close();
         else
-          this.bindingSet_.addBinding(this, e.handle);
+          this.receiver_.$.bindHandle(e.handle);
       }
 
       this.interceptor_.start();
@@ -174,10 +169,10 @@ var WebNFCTest = (() => {
         } else if (this.is_formatted_tag_ && !options.overwrite) {
           // Resolves with NotAllowedError if there are NDEF records on the device
           // and overwrite is false.
-          resolve(createNDEFError(device.mojom.NDEFErrorType.NOT_ALLOWED));
+          resolve(createNDEFError(NDEFErrorType.NOT_ALLOWED));
         } else if (this.data_transfer_failed_) {
           // Resolves with NetworkError if data transfer fails.
-          resolve(createNDEFError(device.mojom.NDEFErrorType.IO_ERROR));
+          resolve(createNDEFError(NDEFErrorType.IO_ERROR));
         } else {
           resolve(createNDEFError(null));
         }
@@ -223,9 +218,9 @@ var WebNFCTest = (() => {
 
     getHWError() {
       if (this.hw_status_ === NFCHWStatus.DISABLED)
-        return createNDEFError(device.mojom.NDEFErrorType.NOT_READABLE);
+        return createNDEFError(NDEFErrorType.NOT_READABLE);
       if (this.hw_status_ === NFCHWStatus.NOT_SUPPORTED)
-        return createNDEFError(device.mojom.NDEFErrorType.NOT_SUPPORTED);
+        return createNDEFError(NDEFErrorType.NOT_SUPPORTED);
       return null;
     }
 
@@ -264,7 +259,7 @@ var WebNFCTest = (() => {
     cancelPendingPushOperation() {
       if (this.pending_promise_func_) {
         this.pending_promise_func_(
-            createNDEFError(device.mojom.NDEFErrorType.OPERATION_CANCELLED));
+            createNDEFError(NDEFErrorType.OPERATION_CANCELLED));
         this.pending_promise_func_ = null;
       }
 
@@ -318,15 +313,15 @@ var WebNFCTest = (() => {
     simulateNonNDEFTagDiscovered() {
       // Notify NotSupportedError to all active readers.
       if (this.watchers_.length != 0) {
-        this.client_.onError(new device.mojom.NDEFError({
-          errorType: device.mojom.NDEFErrorType.NOT_SUPPORTED,
+        this.client_.onError({
+          errorType: NDEFErrorType.NOT_SUPPORTED,
           errorMessage: ''
-        }));
+        });
       }
       // Reject the pending push with NotSupportedError.
       if (this.pending_promise_func_) {
         this.pending_promise_func_(
-            createNDEFError(device.mojom.NDEFErrorType.NOT_SUPPORTED));
+            createNDEFError(NDEFErrorType.NOT_SUPPORTED));
         this.pending_promise_func_ = null;
       }
     }
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
index 01d2ec23396..2846adda6ab 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
@@ -1,13 +1,15 @@
-'use strict';
+import * as vrMojom from '/gen/device/vr/public/mojom/vr_service.mojom.m.js';
+import {GamepadHand, GamepadMapping} from '/gen/device/gamepad/public/mojom/gamepad.mojom.m.js';
 
 // This polyfill library implements the WebXR Test API as specified here:
 // https://github.com/immersive-web/webxr-test-api
 
-const defaultMojoFromFloor = new gfx.mojom.Transform();
-defaultMojoFromFloor.matrix = [1, 0,     0, 0,
-                               0, 1,     0, 0,
-                               0, 0,     1, 0,
-                               0, -1.65, 0, 1];
+const defaultMojoFromFloor = {
+  matrix: [1, 0,     0, 0,
+           0, 1,     0, 0,
+           0, 0,     1, 0,
+           0, -1.65, 0, 1]
+};
 const default_stage_parameters = {
   mojoFromFloor: defaultMojoFromFloor,
   bounds: null
@@ -44,15 +46,22 @@ function getMatrixFromTransform(transform) {
           m14, m24, m34, 1];
 }
 
+function getPoseFromTransform(transform) {
+  const [px, py, pz] = transform.position;
+  const [ox, oy, oz, ow] = transform.orientation;
+  return {
+    position: {x: px, y: py, z: pz},
+    orientation: {x: ox, y: oy, z: oz, w: ow},
+  };
+}
+
 function composeGFXTransform(fakeTransformInit) {
-  const transform = new gfx.mojom.Transform();
-  transform.matrix = getMatrixFromTransform(fakeTransformInit);
-  return transform;
+  return {matrix: getMatrixFromTransform(fakeTransformInit)};
 }
 
 class ChromeXRTest {
   constructor() {
-    this.mockVRService_ = new MockVRService(mojo.frameInterfaces);
+    this.mockVRService_ = new MockVRService();
   }
 
   simulateDeviceConnection(init_params) {
@@ -60,7 +69,7 @@ class ChromeXRTest {
   }
 
   disconnectAllDevices() {
-    this.mockVRService_.removeAllRuntimes(device);
+    this.mockVRService_.removeAllRuntimes();
     return Promise.resolve();
   }
 
@@ -103,13 +112,13 @@ class ChromeXRTest {
 // Mock service implements the VRService mojo interface.
 class MockVRService {
   constructor() {
-    this.bindingSet_ = new mojo.BindingSet(device.mojom.VRService);
+    this.receiver_ = new vrMojom.VRServiceReceiver(this);
     this.runtimes_ = [];
 
     this.interceptor_ =
-        new MojoInterfaceInterceptor(device.mojom.VRService.name);
-    this.interceptor_.oninterfacerequest = e =>
-        this.bindingSet_.addBinding(this, e.handle);
+        new MojoInterfaceInterceptor(vrMojom.VRService.$interfaceName);
+    this.interceptor_.oninterfacerequest =
+        e => this.receiver_.$.bindHandle(e.handle);
     this.interceptor_.start();
   }
 
@@ -151,7 +160,7 @@ class MockVRService {
     this.client_ = client;
   }
 
-  requestSession(sessionOptions, was_activation) {
+  requestSession(sessionOptions) {
     const requests = [];
     // Request a session from all the runtimes.
     for (let i = 0; i < this.runtimes_.length; i++) {
@@ -163,31 +172,21 @@ class MockVRService {
       for (let i = 0; i < results.length; i++) {
         if (results[i].session) {
           // Construct a dummy metrics recorder
-          const metricsRecorderPtr = new device.mojom.XRSessionMetricsRecorderPtr();
-          const metricsRecorderRequest = mojo.makeRequest(metricsRecorderPtr);
-          const metricsRecorderBinding = new mojo.Binding(
-              device.mojom.XRSessionMetricsRecorder, new MockXRSessionMetricsRecorder(), metricsRecorderRequest);
+          const metricsRecorderPtr = new vrMojom.XRSessionMetricsRecorderRemote();
+          metricsRecorderPtr.$.bindNewPipeAndPassReceiver().handle.close();
 
           const success = {
             session: results[i].session,
             metricsRecorder: metricsRecorderPtr,
           };
 
-          return {
-            result: {
-              success : success,
-              $tag :  0
-            }
-          };
+          return {result: {success}};
         }
       }
 
       // If there were no successful results, returns a null session.
       return {
-        result: {
-          failureReason : device.mojom.RequestSessionError.NO_RUNTIME_FOUND,
-          $tag :  1
-        }
+        result: {failureReason: vrMojom.RequestSessionError.NO_RUNTIME_FOUND}
       };
     });
   }
@@ -216,17 +215,22 @@ class MockVRService {
     });
   }
 
+  setFramesThrottled(throttled) {
+    this.setFramesThrottledImpl(throttled);
+  }
+
+  // May be overridden by specific tests.
+  setFramesThrottledImpl(throttled) {}
+
   // Only handles asynchronous calls to makeXrCompatible. Synchronous calls are
   // not supported in Javascript.
   makeXrCompatible() {
     if (this.runtimes_.length == 0) {
-      return Promise.resolve({
-        xrCompatibleResult: device.mojom.XrCompatibleResult.kNoDeviceAvailable
-      });
+      return {
+        xrCompatibleResult: vrMojom.XrCompatibleResult.kNoDeviceAvailable
+      };
     }
-    return Promise.resolve({
-      xrCompatibleResult: device.mojom.XrCompatibleResult.kAlreadyCompatible
-    });
+    return {xrCompatibleResult: vrMojom.XrCompatibleResult.kAlreadyCompatible};
   }
 }
 
@@ -324,36 +328,36 @@ class MockRuntime {
   // Mapping from string feature names to the corresponding mojo types.
   // This is exposed as a member for extensibility.
   static featureToMojoMap = {
-    'viewer': device.mojom.XRSessionFeature.REF_SPACE_VIEWER,
-    'local': device.mojom.XRSessionFeature.REF_SPACE_LOCAL,
-    'local-floor': device.mojom.XRSessionFeature.REF_SPACE_LOCAL_FLOOR,
-    'bounded-floor': device.mojom.XRSessionFeature.REF_SPACE_BOUNDED_FLOOR,
-    'unbounded': device.mojom.XRSessionFeature.REF_SPACE_UNBOUNDED,
-    'hit-test': device.mojom.XRSessionFeature.HIT_TEST,
-    'dom-overlay': device.mojom.XRSessionFeature.DOM_OVERLAY,
-    'light-estimation': device.mojom.XRSessionFeature.LIGHT_ESTIMATION,
-    'anchors': device.mojom.XRSessionFeature.ANCHORS,
+    'viewer': vrMojom.XRSessionFeature.REF_SPACE_VIEWER,
+    'local': vrMojom.XRSessionFeature.REF_SPACE_LOCAL,
+    'local-floor': vrMojom.XRSessionFeature.REF_SPACE_LOCAL_FLOOR,
+    'bounded-floor': vrMojom.XRSessionFeature.REF_SPACE_BOUNDED_FLOOR,
+    'unbounded': vrMojom.XRSessionFeature.REF_SPACE_UNBOUNDED,
+    'hit-test': vrMojom.XRSessionFeature.HIT_TEST,
+    'dom-overlay': vrMojom.XRSessionFeature.DOM_OVERLAY,
+    'light-estimation': vrMojom.XRSessionFeature.LIGHT_ESTIMATION,
+    'anchors': vrMojom.XRSessionFeature.ANCHORS,
   };
 
   static sessionModeToMojoMap = {
-    "inline": device.mojom.XRSessionMode.kInline,
-    "immersive-vr": device.mojom.XRSessionMode.kImmersiveVr,
-    "immersive-ar": device.mojom.XRSessionMode.kImmersiveAr,
+    "inline": vrMojom.XRSessionMode.kInline,
+    "immersive-vr": vrMojom.XRSessionMode.kImmersiveVr,
+    "immersive-ar": vrMojom.XRSessionMode.kImmersiveAr,
   };
 
   static environmentBlendModeToMojoMap = {
-    "opaque": device.mojom.XREnvironmentBlendMode.kOpaque,
-    "alpha-blend": device.mojom.XREnvironmentBlendMode.kAlphaBlend,
-    "additive": device.mojom.XREnvironmentBlendMode.kAdditive,
+    "opaque": vrMojom.XREnvironmentBlendMode.kOpaque,
+    "alpha-blend": vrMojom.XREnvironmentBlendMode.kAlphaBlend,
+    "additive": vrMojom.XREnvironmentBlendMode.kAdditive,
   };
 
   static interactionModeToMojoMap = {
-    "screen-space": device.mojom.XRInteractionMode.kScreenSpace,
-    "world-space": device.mojom.XRInteractionMode.kWorldSpace,
+    "screen-space": vrMojom.XRInteractionMode.kScreenSpace,
+    "world-space": vrMojom.XRInteractionMode.kWorldSpace,
   };
 
   constructor(fakeDeviceInit, service) {
-    this.sessionClient_ = new device.mojom.XRSessionClientPtr();
+    this.sessionClient_ = null;
     this.presentation_provider_ = new MockXRPresentationProvider();
 
     this.pose_ = null;
@@ -375,11 +379,11 @@ class MockRuntime {
     // Currently active transient hit test subscriptions.
     this.transientHitTestSubscriptions_ = new Map();
     // ID of the next subscription to be assigned.
-    this.next_hit_test_id_ = 1;
+    this.next_hit_test_id_ = 1n;
 
     this.anchor_controllers_ = new Map();
     // ID of the next anchor to be assigned.
-    this.next_anchor_id_ = 1;
+    this.next_anchor_id_ = 1n;
     // Anchor creation callback (initially null, can be set by tests).
     this.anchor_creation_callback_ = null;
 
@@ -406,10 +410,10 @@ class MockRuntime {
 
     // Initialize DisplayInfo first to set the defaults, then override with
     // anything from the deviceInit
-    if (this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveVr)
-     || this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveAr)) {
+    if (this.supportedModes_.includes(vrMojom.XRSessionMode.kImmersiveVr) ||
+        this.supportedModes_.includes(vrMojom.XRSessionMode.kImmersiveAr)) {
       this.displayInfo_ = this.getImmersiveDisplayInfo();
-    } else if (this.supportedModes_.includes(device.mojom.XRSessionMode.kInline)) {
+    } else if (this.supportedModes_.includes(vrMojom.XRSessionMode.kInline)) {
       this.displayInfo_ = this.getNonImmersiveDisplayInfo();
     } else {
       // This should never happen!
@@ -458,10 +462,11 @@ class MockRuntime {
     if (blendMode in MockRuntime.environmentBlendModeToMojoMap) {
       return MockRuntime.environmentBlendModeToMojoMap[blendMode];
     } else {
-      if (this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveAr)) {
-        return device.mojom.XREnvironmentBlendMode.kAdditive;
-      } else if (this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveVr)) {
-        return device.mojom.XREnvironmentBlendMode.kOpaque;
+      if (this.supportedModes_.includes(vrMojom.XRSessionMode.kImmersiveAr)) {
+        return vrMojom.XREnvironmentBlendMode.kAdditive;
+      } else if (this.supportedModes_.includes(
+            vrMojom.XRSessionMode.kImmersiveVr)) {
+        return vrMojom.XREnvironmentBlendMode.kOpaque;
       }
     }
   }
@@ -470,7 +475,7 @@ class MockRuntime {
     if (interactionMode in MockRuntime.interactionModeToMojoMap) {
       return MockRuntime.interactionModeToMojoMap[interactionMode];
     } else {
-      return device.mojom.XRInteractionMode.kWorldSpace;
+      return vrMojom.XRInteractionMode.kWorldSpace;
     }
   }
 
@@ -478,8 +483,9 @@ class MockRuntime {
   disconnect() {
     this.service_.removeRuntime(this);
     this.presentation_provider_.Close();
-    if (this.sessionClient_.ptr.isBound()) {
-      this.sessionClient_.ptr.reset();
+    if (this.sessionClient_) {
+      this.sessionClient_.$.close();
+      this.sessionClient_ = null;
     }
 
     return Promise.resolve();
@@ -498,7 +504,7 @@ class MockRuntime {
         }
       }
 
-      if (changed && this.sessionClient_.ptr.isBound()) {
+      if (changed && this.sessionClient_) {
         this.sessionClient_.onChanged(this.displayInfo_);
       }
     }
@@ -528,16 +534,16 @@ class MockRuntime {
     let mojoState = null;
     switch (visibilityState) {
       case "visible":
-        mojoState = device.mojom.XRVisibilityState.VISIBLE;
+        mojoState = vrMojom.XRVisibilityState.VISIBLE;
         break;
       case "visible-blurred":
-        mojoState = device.mojom.XRVisibilityState.VISIBLE_BLURRED;
+        mojoState = vrMojom.XRVisibilityState.VISIBLE_BLURRED;
         break;
       case "hidden":
-        mojoState = device.mojom.XRVisibilityState.HIDDEN;
+        mojoState = vrMojom.XRVisibilityState.HIDDEN;
         break;
     }
-    if (mojoState) {
+    if (mojoState && this.sessionClient_) {
       this.sessionClient_.onVisibilityStateChanged(mojoState);
     }
   }
@@ -567,11 +573,9 @@ class MockRuntime {
       this.stageParameters_.bounds = this.bounds_;
     }
 
-    this.stageParameters_.mojoFromFloor = new gfx.mojom.Transform();
-
     // floorOrigin is passed in as mojoFromFloor.
-    this.stageParameters_.mojoFromFloor.matrix =
-      getMatrixFromTransform(floorOrigin);
+    this.stageParameters_.mojoFromFloor =
+        {matrix: getMatrixFromTransform(floorOrigin)};
 
     this.onStageParametersUpdated();
   }
@@ -707,7 +711,7 @@ class MockRuntime {
       if (feature in MockRuntime.featureToMojoMap) {
         return MockRuntime.featureToMojoMap[feature];
       } else {
-        return device.mojom.XRSessionFeature.INVALID;
+        return vrMojom.XRSessionFeature.INVALID;
       }
     }
 
@@ -715,7 +719,7 @@ class MockRuntime {
 
     for (let i = 0; i < supportedFeatures.length; i++) {
       const feature = convertFeatureToMojom(supportedFeatures[i]);
-      if (feature !== device.mojom.XRSessionFeature.INVALID) {
+      if (feature !== vrMojom.XRSessionFeature.INVALID) {
         this.supportedFeatures_.push(feature);
       }
     }
@@ -774,11 +778,12 @@ class MockRuntime {
           inputState: input_state,
           timeDelta: {
             // window.performance.now() is in milliseconds, so convert to microseconds.
-            microseconds: window.performance.now() * 1000,
+            microseconds: BigInt(Math.floor(window.performance.now() * 1000)),
           },
           frameId: this.next_frame_id_,
           bufferHolder: null,
           bufferSize: {},
+          renderingTimeRatio: 0,
           stageParameters: this.stageParameters_,
           stageParametersId: this.stageParametersId_,
         };
@@ -794,7 +799,7 @@ class MockRuntime {
         resolve({frameData});
       };
 
-      if(this.sessionOptions_.mode == device.mojom.XRSessionMode.kInline) {
+      if(this.sessionOptions_.mode == vrMojom.XRSessionMode.kInline) {
         // Inline sessions should not have a delay introduced since it causes them
         // to miss a vsync blink-side and delays propagation of changes that happened
         // within a rAFcb by one frame (e.g. setViewerOrigin() calls would take 2 frames
@@ -809,37 +814,46 @@ class MockRuntime {
   }
 
   getEnvironmentIntegrationProvider(environmentProviderRequest) {
-    this.environmentProviderBinding_ = new mojo.AssociatedBinding(
-        device.mojom.XREnvironmentIntegrationProvider, this,
-        environmentProviderRequest);
+    if (this.environmentProviderReceiver_) {
+      this.environmentProviderReceiver_.$.close();
+    }
+    this.environmentProviderReceiver_ =
+        new vrMojom.XREnvironmentIntegrationProviderReceiver(this);
+    this.environmentProviderReceiver_.$.bindHandle(
+        environmentProviderRequest.handle);
   }
 
+  setInputSourceButtonListener(listener) { listener.$.close(); }
+
   // Note that if getEnvironmentProvider hasn't finished running yet this will
   // be undefined. It's recommended that you allow a successful task to post
   // first before attempting to close.
   closeEnvironmentIntegrationProvider() {
-    this.environmentProviderBinding_.close();
+    if (this.environmentProviderReceiver_) {
+      this.environmentProviderReceiver_.$.close();
+    }
   }
 
   closeDataProvider() {
-    this.dataProviderBinding_.close();
+    this.closeEnvironmentIntegrationProvider();
+    this.dataProviderReceiver_.$.close();
     this.sessionOptions_ = null;
   }
 
   // XREnvironmentIntegrationProvider implementation:
   subscribeToHitTest(nativeOriginInformation, entityTypes, ray) {
-    if (!this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveAr)) {
+    if (!this.supportedModes_.includes(vrMojom.XRSessionMode.kImmersiveAr)) {
       // Reject outside of AR.
       return Promise.resolve({
-        result : device.mojom.SubscribeToHitTestResult.FAILURE_GENERIC,
-        subscriptionId : 0
+        result : vrMojom.SubscribeToHitTestResult.FAILURE_GENERIC,
+        subscriptionId : 0n
       });
     }
 
     if (!this._nativeOriginKnown(nativeOriginInformation)) {
       return Promise.resolve({
-        result : device.mojom.SubscribeToHitTestResult.FAILURE_GENERIC,
-        subscriptionId : 0
+        result : vrMojom.SubscribeToHitTestResult.FAILURE_GENERIC,
+        subscriptionId : 0n
       });
     }
 
@@ -856,24 +870,24 @@ class MockRuntime {
           this.hitTestSubscriptions_.set(id, { nativeOriginInformation, entityTypes, ray, controller });
 
           return Promise.resolve({
-            result : device.mojom.SubscribeToHitTestResult.SUCCESS,
+            result : vrMojom.SubscribeToHitTestResult.SUCCESS,
             subscriptionId : id
           });
         } else {
           return Promise.resolve({
-            result : device.mojom.SubscribeToHitTestResult.FAILURE_GENERIC,
-            subscriptionId : 0
+            result : vrMojom.SubscribeToHitTestResult.FAILURE_GENERIC,
+            subscriptionId : 0n
           });
         }
       });
   }
 
   subscribeToHitTestForTransientInput(profileName, entityTypes, ray){
-    if (!this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveAr)) {
+    if (!this.supportedModes_.includes(vrMojom.XRSessionMode.kImmersiveAr)) {
       // Reject outside of AR.
       return Promise.resolve({
-        result : device.mojom.SubscribeToHitTestResult.FAILURE_GENERIC,
-        subscriptionId : 0
+        result : vrMojom.SubscribeToHitTestResult.FAILURE_GENERIC,
+        subscriptionId : 0n
       });
     }
 
@@ -891,13 +905,13 @@ class MockRuntime {
           this.transientHitTestSubscriptions_.set(id, { profileName, entityTypes, ray, controller });
 
           return Promise.resolve({
-            result : device.mojom.SubscribeToHitTestResult.SUCCESS,
+            result : vrMojom.SubscribeToHitTestResult.SUCCESS,
             subscriptionId : id
           });
         } else {
           return Promise.resolve({
-            result : device.mojom.SubscribeToHitTestResult.FAILURE_GENERIC,
-            subscriptionId : 0
+            result : vrMojom.SubscribeToHitTestResult.FAILURE_GENERIC,
+            subscriptionId : 0n
           });
         }
       });
@@ -922,8 +936,8 @@ class MockRuntime {
     return new Promise((resolve) => {
       if(this.anchor_creation_callback_ == null) {
         resolve({
-          result : device.mojom.CreateAnchorResult.FAILURE,
-          anchorId : 0
+          result : vrMojom.CreateAnchorResult.FAILURE,
+          anchorId : 0n
         });
 
         return;
@@ -932,8 +946,8 @@ class MockRuntime {
       const mojoFromNativeOrigin = this._getMojoFromNativeOrigin(nativeOriginInformation);
       if(mojoFromNativeOrigin == null) {
         resolve({
-          result : device.mojom.CreateAnchorResult.FAILURE,
-          anchorId : 0
+          result : vrMojom.CreateAnchorResult.FAILURE,
+          anchorId : 0n
         });
 
         return;
@@ -962,22 +976,22 @@ class MockRuntime {
                 anchorController.id = anchor_id;
 
                 resolve({
-                  result : device.mojom.CreateAnchorResult.SUCCESS,
+                  result : vrMojom.CreateAnchorResult.SUCCESS,
                   anchorId : anchor_id
                 });
               } else {
                 // The test has rejected anchor creation.
                 resolve({
-                  result : device.mojom.CreateAnchorResult.FAILURE,
-                  anchorId : 0
+                  result : vrMojom.CreateAnchorResult.FAILURE,
+                  anchorId : 0n
                 });
               }
             })
             .catch(() => {
               // The test threw an error, treat anchor creation as failed.
               resolve({
-                result : device.mojom.CreateAnchorResult.FAILURE,
-                anchorId : 0
+                result : vrMojom.CreateAnchorResult.FAILURE,
+                anchorId : 0n
               });
             });
     });
@@ -989,21 +1003,25 @@ class MockRuntime {
       // Not supported yet.
 
       resolve({
-        result : device.mojom.CreateAnchorResult.FAILURE,
-        anchorId : 0
+        result : vrMojom.CreateAnchorResult.FAILURE,
+        anchorId : 0n,
       });
     });
   }
 
+  detachAnchor(anchorId) {}
+
   // Utility function
   requestRuntimeSession(sessionOptions) {
     return this.runtimeSupportsSession(sessionOptions).then((result) => {
       // The JavaScript bindings convert c_style_names to camelCase names.
-      const options = new device.mojom.XRPresentationTransportOptions();
-      options.transportMethod =
-          device.mojom.XRPresentationTransportMethod.SUBMIT_AS_MAILBOX_HOLDER;
-      options.waitForTransferNotification = true;
-      options.waitForRenderNotification = true;
+      const options = {
+        transportMethod:
+            vrMojom.XRPresentationTransportMethod.SUBMIT_AS_MAILBOX_HOLDER,
+        waitForTransferNotification: true,
+        waitForRenderNotification: true,
+        waitForGpuFence: false,
+      };
 
       let submit_frame_sink;
       if (result.supportsSession) {
@@ -1013,13 +1031,15 @@ class MockRuntime {
           transportOptions: options
         };
 
-        const dataProviderPtr = new device.mojom.XRFrameDataProviderPtr();
-        const dataProviderRequest = mojo.makeRequest(dataProviderPtr);
-        this.dataProviderBinding_ = new mojo.Binding(
-            device.mojom.XRFrameDataProvider, this, dataProviderRequest);
+        const dataProviderPtr = new vrMojom.XRFrameDataProviderRemote();
+        this.dataProviderReceiver_ =
+            new vrMojom.XRFrameDataProviderReceiver(this);
+        this.dataProviderReceiver_.$.bindHandle(
+            dataProviderPtr.$.bindNewPipeAndPassReceiver().handle);
         this.sessionOptions_ = sessionOptions;
 
-        const clientReceiver = mojo.makeRequest(this.sessionClient_);
+        this.sessionClient_ = new vrMojom.XRSessionClientRemote();
+        const clientReceiver = this.sessionClient_.$.bindNewPipeAndPassReceiver();
 
         const enabled_features = [];
         for (let i = 0; i < sessionOptions.requiredFeatures.length; i++) {
@@ -1044,6 +1064,7 @@ class MockRuntime {
             displayInfo: this.displayInfo_,
             enabledFeatures: enabled_features,
             deviceConfig: {
+              usesInputEventing: false,
               defaultFramebufferScale: this.defaultFramebufferScale_,
               supportsViewportScaling: true
             },
@@ -1066,17 +1087,17 @@ class MockRuntime {
   // Private functions - utilities:
   _nativeOriginKnown(nativeOriginInformation){
 
-    if (nativeOriginInformation.$tag == device.mojom.XRNativeOriginInformation.Tags.inputSourceId) {
+    if (nativeOriginInformation.inputSourceId !== undefined) {
       if (!this.input_sources_.has(nativeOriginInformation.inputSourceId)) {
         // Unknown input source.
         return false;
       }
 
       return true;
-    } else if (nativeOriginInformation.$tag == device.mojom.XRNativeOriginInformation.Tags.referenceSpaceType) {
+    } else if (nativeOriginInformation.referenceSpaceType !== undefined) {
       // Bounded_floor & unbounded ref spaces are not yet supported for AR:
-      if (nativeOriginInformation.referenceSpaceType == device.mojom.XRReferenceSpaceType.kUnbounded
-       || nativeOriginInformation.referenceSpaceType == device.mojom.XRReferenceSpaceType.kBoundedFlor) {
+      if (nativeOriginInformation.referenceSpaceType == vrMojom.XRReferenceSpaceType.kUnbounded
+       || nativeOriginInformation.referenceSpaceType == vrMojom.XRReferenceSpaceType.kBoundedFloor) {
         return false;
       }
 
@@ -1091,24 +1112,21 @@ class MockRuntime {
 
   // Modifies passed in frameData to add anchor information.
   _calculateAnchorInformation(frameData) {
-    if (!this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveAr)) {
+    if (!this.supportedModes_.includes(vrMojom.XRSessionMode.kImmersiveAr)) {
       return;
     }
 
-    frameData.anchorsData = new device.mojom.XRAnchorsData();
-    frameData.anchorsData.allAnchorsIds = [];
-    frameData.anchorsData.updatedAnchorsData = [];
-
+    frameData.anchorsData = {allAnchorsIds: [], updatedAnchorsData: []};
     for(const [id, controller] of this.anchor_controllers_) {
       frameData.anchorsData.allAnchorsIds.push(id);
 
       // Send the entire anchor data over if there was a change since last GetFrameData().
       if(controller.dirty) {
-        const anchorData = new device.mojom.XRAnchorData();
-        anchorData.id = id;
+        const anchorData = {id};
         if(!controller.paused) {
-          anchorData.mojoFromAnchor = XRMathHelper.decomposeRigidTransform(
-            controller.getAnchorOrigin());
+          anchorData.mojoFromAnchor = getPoseFromTransform(
+              XRMathHelper.decomposeRigidTransform(
+                  controller.getAnchorOrigin()));
         }
 
         controller.markProcessed();
@@ -1133,14 +1151,12 @@ class MockRuntime {
 
   // Modifies passed in frameData to add hit test results.
   _calculateHitTestResults(frameData) {
-    if (!this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveAr)) {
+    if (!this.supportedModes_.includes(vrMojom.XRSessionMode.kImmersiveAr)) {
       return;
     }
 
-    frameData.hitTestSubscriptionResults = new device.mojom.XRHitTestSubscriptionResultsData();
-    frameData.hitTestSubscriptionResults.results = [];
-    frameData.hitTestSubscriptionResults.transientInputResults = [];
-
+    frameData.hitTestSubscriptionResults = {results: [],
+                                            transientInputResults: []};
     if (!this.world_) {
       return;
     }
@@ -1156,21 +1172,16 @@ class MockRuntime {
       );
 
       const results = this._hitTestWorld(mojo_ray_origin, mojo_ray_direction, subscription.entityTypes);
-
-      const result = new device.mojom.XRHitTestSubscriptionResultData();
-      result.subscriptionId = id;
-      result.hitTestResults = results;
-
-      frameData.hitTestSubscriptionResults.results.push(result);
+      frameData.hitTestSubscriptionResults.results.push(
+          {subscriptionId: id, hitTestResults: results});
     }
 
     // Transient hit test:
     const mojo_from_viewer = this._getMojoFromViewer();
 
     for (const [id, subscription] of this.transientHitTestSubscriptions_) {
-      const result = new device.mojom.XRHitTestTransientInputSubscriptionResultData();
-      result.subscriptionId = id;
-      result.inputSourceIdToHitTestResults = new Map();
+      const result = {subscriptionId: id,
+                      inputSourceIdToHitTestResults: new Map()};
 
       // Find all input sources that match the profile name:
       const matching_input_sources = Array.from(this.input_sources_.values())
@@ -1241,8 +1252,8 @@ class MockRuntime {
   // Returns array of XRHitResults, each entry will be decorated with the distance from the ray origin (along the ray).
   _hitTestRegion(region, origin, direction, entityTypes) {
     const regionNameToMojoEnum = {
-      "point":device.mojom.EntityTypeForHitTest.POINT,
-      "plane":device.mojom.EntityTypeForHitTest.PLANE,
+      "point": vrMojom.EntityTypeForHitTest.POINT,
+      "plane": vrMojom.EntityTypeForHitTest.PLANE,
       "mesh":null
     };
 
@@ -1333,7 +1344,7 @@ class MockRuntime {
           return null;
         }
 
-        const hitResult = new device.mojom.XRHitResult();
+        const hitResult = {planeId: 0n};
         hitResult.distance = distance;  // Extend the object with additional information used by higher layers.
                                         // It will not be serialized over mojom.
 
@@ -1359,8 +1370,8 @@ class MockRuntime {
         matrix[14] = intersection_point.z;
         matrix[15] = 1;
 
-        hitResult.mojoFromResult = XRMathHelper.decomposeRigidTransform(matrix);
-
+        hitResult.mojoFromResult = getPoseFromTransform(
+            XRMathHelper.decomposeRigidTransform(matrix));
         return hitResult;
       }
     }
@@ -1385,28 +1396,28 @@ class MockRuntime {
   _getMojoFromNativeOrigin(nativeOriginInformation) {
     const mojo_from_viewer = this._getMojoFromViewer();
 
-    if (nativeOriginInformation.$tag == device.mojom.XRNativeOriginInformation.Tags.inputSourceId) {
+    if (nativeOriginInformation.inputSourceId !== undefined) {
       if (!this.input_sources_.has(nativeOriginInformation.inputSourceId)) {
         return null;
       } else {
         const inputSource = this.input_sources_.get(nativeOriginInformation.inputSourceId);
         return inputSource._getMojoFromInputSource(mojo_from_viewer);
       }
-    } else if (nativeOriginInformation.$tag == device.mojom.XRNativeOriginInformation.Tags.referenceSpaceType) {
+    } else if (nativeOriginInformation.referenceSpaceType !== undefined) {
       switch (nativeOriginInformation.referenceSpaceType) {
-        case device.mojom.XRReferenceSpaceType.kLocal:
+        case vrMojom.XRReferenceSpaceType.kLocal:
           return XRMathHelper.identity();
-        case device.mojom.XRReferenceSpaceType.kLocalFloor:
+        case vrMojom.XRReferenceSpaceType.kLocalFloor:
           if (this.stageParameters_ == null || this.stageParameters_.mojoFromFloor == null) {
             console.warn("Standing transform not available.");
             return null;
           }
           return this.stageParameters_.mojoFromFloor.matrix;
-        case device.mojom.XRReferenceSpaceType.kViewer:
+        case vrMojom.XRReferenceSpaceType.kViewer:
           return mojo_from_viewer;
-        case device.mojom.XRReferenceSpaceType.kBoundedFlor:
+        case vrMojom.XRReferenceSpaceType.kBoundedFloor:
           return null;
-        case device.mojom.XRReferenceSpaceType.kUnbounded:
+        case vrMojom.XRReferenceSpaceType.kUnbounded:
           return null;
         default:
           throw new TypeError("Unrecognized XRReferenceSpaceType!");
@@ -1418,12 +1429,6 @@ class MockRuntime {
   }
 }
 
-class MockXRSessionMetricsRecorder {
-  reportFeatureUsed(feature) {
-    // Do nothing
-  }
-}
-
 class MockXRInputSource {
   constructor(fakeInputSourceInit, id, pairedDevice) {
     this.source_id_ = id;
@@ -1633,9 +1638,10 @@ class MockXRInputSource {
 
   // Helpers for Mojom
   getInputSourceState() {
-    const input_state = new device.mojom.XRInputSourceState();
+    const input_state = {};
 
     input_state.sourceId = this.source_id_;
+    input_state.isAuxiliary = false;
 
     input_state.primaryInputPressed = this.primary_input_pressed_;
     input_state.primaryInputClicked = this.primary_input_clicked_;
@@ -1658,17 +1664,17 @@ class MockXRInputSource {
     input_state.emulatedPosition = this.emulated_position_;
 
     if (this.desc_dirty_) {
-      const input_desc = new device.mojom.XRInputSourceDescription();
+      const input_desc = {};
 
       switch (this.target_ray_mode_) {
         case 'gaze':
-          input_desc.targetRayMode = device.mojom.XRTargetRayMode.GAZING;
+          input_desc.targetRayMode = vrMojom.XRTargetRayMode.GAZING;
           break;
         case 'tracked-pointer':
-          input_desc.targetRayMode = device.mojom.XRTargetRayMode.POINTING;
+          input_desc.targetRayMode = vrMojom.XRTargetRayMode.POINTING;
           break;
         case 'screen':
-          input_desc.targetRayMode = device.mojom.XRTargetRayMode.TAPPING;
+          input_desc.targetRayMode = vrMojom.XRTargetRayMode.TAPPING;
           break;
         default:
           throw new Error('Unhandled target ray mode ' + this.target_ray_mode_);
@@ -1676,13 +1682,13 @@ class MockXRInputSource {
 
       switch (this.handedness_) {
         case 'left':
-          input_desc.handedness = device.mojom.XRHandedness.LEFT;
+          input_desc.handedness = vrMojom.XRHandedness.LEFT;
           break;
         case 'right':
-          input_desc.handedness = device.mojom.XRHandedness.RIGHT;
+          input_desc.handedness = vrMojom.XRHandedness.RIGHT;
           break;
         default:
-          input_desc.handedness = device.mojom.XRHandedness.NONE;
+          input_desc.handedness = vrMojom.XRHandedness.NONE;
           break;
       }
 
@@ -1716,7 +1722,7 @@ class MockXRInputSource {
       // Since we store mojo_from_input, we need to invert it here before
       // multiplying.
       let input_from_mojo = XRMathHelper.inverse(mojo_from_input);
-      input_desc.inputFromPointer = new gfx.mojom.Transform();
+      input_desc.inputFromPointer = {};
       input_desc.inputFromPointer.matrix =
         XRMathHelper.mul4x4(input_from_mojo, this.mojo_from_pointer_.matrix);
 
@@ -1745,23 +1751,23 @@ class MockXRInputSource {
     // everything to reasonable defaults that tests can override.
     const gamepad = {
       connected: true,
-      id: "",
-      timestamp: 0,
+      id: [],
+      timestamp: 0n,
       axes: [],
       buttons: [],
-      mapping: "xr-standard",
-      display_id: 0,
+      mapping: GamepadMapping.GamepadMappingStandard,
+      displayId: 0,
     };
 
     switch (this.handedness_) {
       case 'left':
-      gamepad.hand = device.mojom.GamepadHand.GamepadHandLeft;
+      gamepad.hand = GamepadHand.GamepadHandLeft;
       break;
       case 'right':
-      gamepad.hand = device.mojom.GamepadHand.GamepadHandRight;
+      gamepad.hand = GamepadHand.GamepadHandRight;
       break;
       default:
-      gamepad.hand = device.mojom.GamepadHand.GamepadHandNone;
+      gamepad.hand = GamepadHand.GamepadHandNone;
       break;
     }
 
@@ -1832,29 +1838,29 @@ class MockXRInputSource {
 // Mojo helper classes
 class MockXRPresentationProvider {
   constructor() {
-    this.binding_ = new mojo.Binding(device.mojom.XRPresentationProvider, this);
-
+    this.receiver_ = null;
     this.submit_frame_count_ = 0;
     this.missing_frame_count_ = 0;
   }
 
-  bindProvider(request) {
-    const providerPtr = new device.mojom.XRPresentationProviderPtr();
-    const providerRequest = mojo.makeRequest(providerPtr);
+  bindProvider() {
+    const provider = new vrMojom.XRPresentationProviderRemote();
 
-    this.binding_.close();
-
-    this.binding_ = new mojo.Binding(
-        device.mojom.XRPresentationProvider, this, providerRequest);
-
-    return providerPtr;
+    if (this.receiver_) {
+      this.receiver_.$.close();
+    }
+    this.receiver_ = new vrMojom.XRPresentationProviderReceiver(this);
+    this.receiver_.$.bindHandle(provider.$.bindNewPipeAndPassReceiver().handle);
+    return provider;
   }
 
   getClientReceiver() {
-    this.submitFrameClient_ = new device.mojom.XRPresentationClientPtr();
-    return mojo.makeRequest(this.submitFrameClient_);
+    this.submitFrameClient_ = new vrMojom.XRPresentationClientRemote();
+    return this.submitFrameClient_.$.bindNewPipeAndPassReceiver();
   }
 
+  updateLayerBounds(frameId, leftBounds, rightBounds, sourceSize) {}
+
   // XRPresentationProvider mojo implementation
   submitFrameMissing(frameId, mailboxHolder, timeWaited) {
     this.missing_frame_count_++;
@@ -1872,10 +1878,23 @@ class MockXRPresentationProvider {
     this.submitFrameClient_.onSubmitFrameRendered();
   }
 
+  submitFrameWithTextureHandle(frameId, texture) {}
+
+  submitFrameDrawnIntoTexture(frameId, syncToken, timeWaited) {}
+
   // Utility methods
   Close() {
-    this.binding_.close();
+    if (this.receiver_) {
+      this.receiver_.$.close();
+    }
   }
 }
 
+// Export these into the global object as a side effect of importing this
+// module.
+self.ChromeXRTest = ChromeXRTest;
+self.MockRuntime = MockRuntime;
+self.MockVRService = MockVRService;
+self.SubscribeToHitTestResult = vrMojom.SubscribeToHitTestResult;
+
 navigator.xr.test = new ChromeXRTest();
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 ef66e0e733f..a66eb44ede7 100644
--- a/tests/wpt/web-platform-tests/resources/test-only-api.js
+++ b/tests/wpt/web-platform-tests/resources/test-only-api.js
@@ -29,72 +29,3 @@ function loadScript(path) {
     return p;
   }
 }
-
-/**
- * A helper for Chromium-based browsers to load Mojo JS bindings
- *
- * This is an async function that works in both workers and windows. It first
- * loads mojo_bindings.js, disables automatic dependency loading, and loads all
- * resources sequentially. The promise resolves if everything loads
- * successfully, or rejects if any exception is raised. If testharness.js is
- * used, an uncaught exception will terminate the test with a harness error
- * (unless `allow_uncaught_exception` is true), which is usually the desired
- * behaviour.
- *
- * This function also works with Blink web tests loaded from file://, in which
- * case file:// will be prepended to all '/gen/...' URLs.
- *
- * Only call this function if isChromiumBased === true.
- *
- * @param {Array.<string>} resources - A list of scripts to load: Mojo JS
- *   bindings should be of the form '/gen/../*.mojom.js' or
- *   '/gen/../*.mojom-lite.js' (requires `lite` to be true); the order does not
- *   matter. Do not include 'mojo_bindings.js' or 'mojo_bindings_lite.js'.
- * @param {boolean=} lite - Whether the lite bindings (*.mojom-lite.js) are used
- *   (default is false).
- * @returns {Promise}
- */
-async function loadMojoResources(resources, lite = false) {
-  if (!isChromiumBased) {
-    throw new Error('MojoJS not enabled; start Chrome with --enable-blink-features=MojoJS,MojoJSTest');
-  }
-  if (resources.length == 0) {
-    return;
-  }
-
-  let genPrefix = '';
-  if (self.location.pathname.includes('/web_tests/')) {
-    // Blink internal web tests
-    genPrefix = 'file://';
-  }
-
-  for (const path of resources) {
-    // We want to load mojo_bindings.js separately to set mojo.config.
-    if (path.endsWith('/mojo_bindings.js')) {
-      throw new Error('Do not load mojo_bindings.js explicitly.');
-    }
-    if (path.endsWith('/mojo_bindings_lite.js')) {
-      throw new Error('Do not load mojo_bindings_lite.js explicitly.');
-    }
-    if (lite) {
-      if (! /^\/gen\/.*\.mojom-lite\.js$/.test(path)) {
-        throw new Error(`Unrecognized resource path: ${path}`);
-      }
-    } else {
-      if (! /^\/gen\/.*\.mojom\.js$/.test(path)) {
-        throw new Error(`Unrecognized resource path: ${path}`);
-      }
-    }
-  }
-
-  if (lite) {
-    await loadScript(genPrefix + '/gen/layout_test_data/mojo/public/js/mojo_bindings_lite.js');
-  } else {
-    await loadScript(genPrefix + '/gen/layout_test_data/mojo/public/js/mojo_bindings.js');
-    mojo.config.autoLoadMojomDeps = false;
-  }
-
-  for (const path of resources) {
-    await loadScript(genPrefix + path);
-  }
-}
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_primary_interface_of.html b/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_primary_interface_of.html
index 5ce457cafd4..a02f40fd785 100644
--- a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_primary_interface_of.html
+++ b/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_primary_interface_of.html
@@ -34,7 +34,7 @@ Object.defineProperty(window.Foo.prototype, "constructor", {
     configurable: true,
     value: window.Foo
   });
-Foo.__proto__ = FooParent;
+Object.setPrototypeOf(Foo, FooParent);
 Foo.prototype[Symbol.toStringTag] = "Foo";
 
 var idlArray = new IdlArray();
diff --git a/tests/wpt/web-platform-tests/screen_enumeration/resources/screenenumeration-helpers.js b/tests/wpt/web-platform-tests/screen_enumeration/resources/screenenumeration-helpers.js
index 7d5d5221943..d0e0d9c56bc 100644
--- a/tests/wpt/web-platform-tests/screen_enumeration/resources/screenenumeration-helpers.js
+++ b/tests/wpt/web-platform-tests/screen_enumeration/resources/screenenumeration-helpers.js
@@ -7,19 +7,10 @@
 //   --enable-blink-features=MojoJS,MojoJSTest
 
 async function loadChromiumResources() {
-  const chromiumResources = [
-    '/gen/ui/gfx/mojom/color_space.mojom.js',
-    '/gen/ui/gfx/mojom/buffer_types.mojom.js',
-    '/gen/ui/gfx/mojom/display_color_spaces.mojom.js',
-    '/gen/ui/gfx/geometry/mojom/geometry.mojom.js',
-    '/gen/ui/display/mojom/display.mojom.js',
-    '/gen/third_party/blink/public/mojom/screen_enumeration/screen_enumeration.mojom.js'
-  ];
-
-  await loadMojoResources(chromiumResources);
   await loadScript('/resources/testdriver.js');
   await loadScript('/resources/testdriver-vendor.js');
-  await loadScript('/resources/chromium/mock-screenenumeration.js');
+  const {HelperTypes} = await import('/resources/chromium/mock-screenenumeration.js');
+  self.HelperTypes = HelperTypes;
 }
 
 async function initialize_screen_enumeration_tests() {
@@ -57,28 +48,24 @@ function screen_enumeration_test(func, name, properties) {
 function makeDisplay(id, bounds, work_area, scale_factor) {
   let myColorSpace = fillColorSpaceVector();
   let myBufferFormat = fillBufferFormatVector();
-  let newDisplay = new display.mojom.Display({id: id,
-                          bounds: new gfx.mojom.Rect({x: bounds.x, y: bounds.y,
-                                                      width: bounds.width,
-                                                      height: bounds.height}),
-                          sizeInPixels: new gfx.mojom.Size({width: bounds.width,
-                                                            height: bounds.height}),
-                          maximumCursorSize: new gfx.mojom.Size({width: 20, height: 20}),
-                          workArea: new gfx.mojom.Rect({x: work_area.x, y: work_area.y,
-                                                        width: work_area.width,
-                                                        height: work_area.height}),
-                          deviceScaleFactor: scale_factor,
-                          rotation: display.mojom.Rotation.VALUE_0,
-                          touchSupport: display.mojom.TouchSupport.UNAVAILABLE,
-                          accelerometerSupport: display.mojom.AccelerometerSupport.UNAVAILABLE,
-                          colorSpaces: new gfx.mojom.DisplayColorSpaces({colorSpaces: myColorSpace,
-                                                                         bufferFormats: myBufferFormat,
-                                                                         sdrWhiteLevel: 1.0}),
-                          colorDepth: 10,
-                          depthPerComponent: 10,
-                          isMonochrome: true,
-                          displayFrequency: 120});
-  return newDisplay;
+  return {
+    id,
+    bounds,
+    sizeInPixels: {width: bounds.width, height: bounds.height},
+    maximumCursorSize: {width: 20, height: 20},
+    workArea: work_area,
+    deviceScaleFactor: scale_factor,
+    rotation: HelperTypes.Rotation.VALUE_0,
+    touchSupport: HelperTypes.TouchSupport.UNAVAILABLE,
+    accelerometerSupport: HelperTypes.AccelerometerSupport.UNAVAILABLE,
+    colorSpaces: {colorSpaces: myColorSpace,
+                  bufferFormats: myBufferFormat,
+                  sdrWhiteLevel: 1.0},
+    colorDepth: 10,
+    depthPerComponent: 10,
+    isMonochrome: true,
+    displayFrequency: 120
+  };
 }
 
 // Function to construct color space vector.
@@ -86,13 +73,14 @@ function makeDisplay(id, bounds, work_area, scale_factor) {
 function fillColorSpaceVector() {
   let colorSpaceVector = [];
   for (let i = 0; i < 6; i++) {
-    let colorSpace = new gfx.mojom.ColorSpace({
-                       primaries: gfx.mojom.ColorSpacePrimaryID.BT709,
-                       transfer: gfx.mojom.ColorSpaceTransferID.BT709,
-                       matrix: gfx.mojom.ColorSpaceMatrixID.BT709,
-                       range: gfx.mojom.ColorSpaceRangeID.LIMITED,
-                       customPrimaryMatrix: fillCustomPrimaryMatrix(),
-                       transferParams: fillTransferParams()});
+    let colorSpace = {
+      primaries: HelperTypes.ColorSpacePrimaryID.BT709,
+      transfer: HelperTypes.ColorSpaceTransferID.BT709,
+      matrix: HelperTypes.ColorSpaceMatrixID.BT709,
+      range: HelperTypes.ColorSpaceRangeID.LIMITED,
+      customPrimaryMatrix: fillCustomPrimaryMatrix(),
+      transferParams: fillTransferParams()
+    };
     colorSpaceVector.push(colorSpace);
   }
   return colorSpaceVector;
@@ -115,12 +103,12 @@ function fillTransferParams () {
 // Function to construct buffer format vector.
 // Values are purely random but mandatory.
 function fillBufferFormatVector() {
-
-  let bufferFormat = [gfx.mojom.BufferFormat.RGBA_8888,
-                      gfx.mojom.BufferFormat.RGBA_8888,
-                      gfx.mojom.BufferFormat.RGBA_8888,
-                      gfx.mojom.BufferFormat.RGBA_8888,
-                      gfx.mojom.BufferFormat.RGBA_8888,
-                      gfx.mojom.BufferFormat.RGBA_8888];
+  const BufferFormat = HelperTypes.BufferFormat;
+  let bufferFormat = [BufferFormat.RGBA_8888,
+                      BufferFormat.RGBA_8888,
+                      BufferFormat.RGBA_8888,
+                      BufferFormat.RGBA_8888,
+                      BufferFormat.RGBA_8888,
+                      BufferFormat.RGBA_8888];
   return bufferFormat;
 }
diff --git a/tests/wpt/web-platform-tests/serial/resources/automation.js b/tests/wpt/web-platform-tests/serial/resources/automation.js
index 98f67fb6282..e88fdb1a9d2 100644
--- a/tests/wpt/web-platform-tests/serial/resources/automation.js
+++ b/tests/wpt/web-platform-tests/serial/resources/automation.js
@@ -11,14 +11,7 @@
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
 
-async function loadChromiumResources() {
-  const chromiumResources = [
-    '/gen/mojo/public/mojom/base/unguessable_token.mojom.js',
-    '/gen/services/device/public/mojom/serial.mojom.js',
-    '/gen/third_party/blink/public/mojom/serial/serial.mojom.js',
-  ];
-  await loadMojoResources(chromiumResources);
-}
+let fakeSerialService = undefined;
 
 // Returns a SerialPort instance and associated FakeSerialPort instance.
 async function getFakeSerialPort(fake) {
@@ -34,16 +27,14 @@ async function getFakeSerialPort(fake) {
   return { port, fakePort };
 }
 
-let fakeSerialService = undefined;
-
 function serial_test(func, name, properties) {
   promise_test(async (test) => {
     assert_implements(navigator.serial, 'missing navigator.serial');
     if (fakeSerialService === undefined) {
       // Try loading a polyfill for the fake serial service.
       if (isChromiumBased) {
-        await loadChromiumResources();
-        await loadScript('/resources/chromium/fake-serial.js');
+        const fakes = await import('/resources/chromium/fake-serial.js');
+        fakeSerialService = fakes.fakeSerialService;
       }
     }
     assert_implements(fakeSerialService, 'missing fakeSerialService after initialization');
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js b/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js
index e98a04b6a09..5ca5f65680c 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js
@@ -6,9 +6,9 @@ test(function() {
         'instance should not have "fetch" method as its property.');
     assert_inherits(self, 'fetch', 'ServiceWorkerGlobalScope should ' +
         'inherit "fetch" method.');
-    assert_own_property(self.__proto__.__proto__, 'fetch',
+    assert_own_property(Object.getPrototypeOf(Object.getPrototypeOf(self)), 'fetch',
         'WorkerGlobalScope should have "fetch" propery in its prototype.');
-    assert_equals(self.fetch, self.__proto__.__proto__.fetch,
+    assert_equals(self.fetch, Object.getPrototypeOf(Object.getPrototypeOf(self)).fetch,
         'ServiceWorkerGlobalScope.fetch should be the same as ' +
         'WorkerGlobalScope.fetch.');
 }, 'Fetch method on the right interface');
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/immutable-prototype-serviceworker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/immutable-prototype-serviceworker.js
index 346b998ceac..d8a94ad46be 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/immutable-prototype-serviceworker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/immutable-prototype-serviceworker.js
@@ -2,9 +2,9 @@ function prototypeChain(global) {
   let result = [];
   while (global !== null) {
     let thrown = false;
-    let next = global.__proto__;
+    let next = Object.getPrototypeOf(global);
     try {
-      global.__proto__ = {};
+      Object.setPrototypeOf(global, {});
       result.push('mutable');
     } catch (e) {
       result.push('immutable');
diff --git a/tests/wpt/web-platform-tests/shadow-dom/HTMLSlotElement-interface.html b/tests/wpt/web-platform-tests/shadow-dom/HTMLSlotElement-interface.html
index 4327e5d03e0..e22de321670 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/HTMLSlotElement-interface.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/HTMLSlotElement-interface.html
@@ -14,7 +14,7 @@
 
 test(function () {
     assert_true('HTMLSlotElement' in window, 'HTMLSlotElement must be defined on window');
-    assert_equals(HTMLSlotElement.prototype.__proto__, HTMLElement.prototype, 'HTMLSlotElement should inherit from HTMLElement');
+    assert_equals(Object.getPrototypeOf(HTMLSlotElement.prototype), HTMLElement.prototype, 'HTMLSlotElement should inherit from HTMLElement');
     assert_true(document.createElement('slot') instanceof HTMLSlotElement, 'slot element should be an instance of HTMLSlotElement');
     assert_true(document.createElement('slot') instanceof HTMLElement, 'slot element should be an instance of HTMLElement');
 }, 'HTMLSlotElement must be defined on window');
diff --git a/tests/wpt/web-platform-tests/shadow-dom/ShadowRoot-interface.html b/tests/wpt/web-platform-tests/shadow-dom/ShadowRoot-interface.html
index e95b1d9542e..de7ac91f250 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/ShadowRoot-interface.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/ShadowRoot-interface.html
@@ -17,7 +17,7 @@ test(function () {
 }, 'Check the existence of ShadowRoot interface');
 
 test(function () {
-    assert_equals(ShadowRoot.prototype.__proto__, DocumentFragment.prototype, 'ShadowRoot must inherit from DocumentFragment');
+    assert_equals(Object.getPrototypeOf(ShadowRoot.prototype), DocumentFragment.prototype, 'ShadowRoot must inherit from DocumentFragment');
 }, 'ShadowRoot must inherit from DocumentFragment');
 
 test(function () {
diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-options.https.html b/tests/wpt/web-platform-tests/shape-detection/detection-options.https.html
index db870e8e470..4b79da2a6e8 100644
--- a/tests/wpt/web-platform-tests/shape-detection/detection-options.https.html
+++ b/tests/wpt/web-platform-tests/shape-detection/detection-options.https.html
@@ -36,8 +36,7 @@ detection_test("BarcodeDetectionTest", async (t, detectionTest) => {
   barcodeDetectionResult = await detectorWithOptions.detect(img);
   assert_array_equals(
       mock.getFormats(),
-      [shapeDetection.mojom.BarcodeFormat.CODE_128,
-       shapeDetection.mojom.BarcodeFormat.QR_CODE],
+      [BarcodeFormat.CODE_128, BarcodeFormat.QR_CODE],
       "formats");
 
   const invalidFormats = [
diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/shapedetection-helpers.js b/tests/wpt/web-platform-tests/shape-detection/resources/shapedetection-helpers.js
index 05424de893d..1b4949b8f6b 100644
--- a/tests/wpt/web-platform-tests/shape-detection/resources/shapedetection-helpers.js
+++ b/tests/wpt/web-platform-tests/shape-detection/resources/shapedetection-helpers.js
@@ -10,23 +10,9 @@
 //   --enable-blink-features=MojoJS,MojoJSTest
 
 async function loadChromiumResources() {
-  const prefix = '/gen/services/shape_detection/public/mojom';
-  const chromiumResources = [
-    '/gen/mojo/public/mojom/base/big_buffer.mojom.js',
-    '/gen/skia/public/mojom/image_info.mojom.js',
-    '/gen/skia/public/mojom/bitmap.mojom.js',
-    '/gen/ui/gfx/geometry/mojom/geometry.mojom.js',
-    `${prefix}/barcodedetection.mojom.js`,
-    `${prefix}/barcodedetection_provider.mojom.js`,
-    `${prefix}/facedetection.mojom.js`,
-    `${prefix}/facedetection_provider.mojom.js`,
-    `${prefix}/textdetection.mojom.js`,
-  ];
-
-  await loadMojoResources(chromiumResources);
-  await loadScript('/resources/chromium/mock-barcodedetection.js');
-  await loadScript('/resources/chromium/mock-facedetection.js');
-  await loadScript('/resources/chromium/mock-textdetection.js');
+  await import('/resources/chromium/mock-barcodedetection.js');
+  await import('/resources/chromium/mock-facedetection.js');
+  await import('/resources/chromium/mock-textdetection.js');
 }
 
 /**
@@ -81,7 +67,7 @@ function detection_test(detectionTestName, func, name, properties) {
 }
 
 function getArrayBufferFromBigBuffer(bigBuffer) {
-  if (bigBuffer.$tag == mojoBase.mojom.BigBuffer.Tags.bytes) {
+  if (bigBuffer.bytes !== undefined) {
     return new Uint8Array(bigBuffer.bytes).buffer;
   }
   return bigBuffer.sharedMemory.bufferHandle.mapBuffer(0,
diff --git a/tests/wpt/web-platform-tests/storage/buckets/buckets_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/storage/buckets/buckets_basic.tentative.https.any.js
deleted file mode 100644
index fffb9af10cc..00000000000
--- a/tests/wpt/web-platform-tests/storage/buckets/buckets_basic.tentative.https.any.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// META: title=Buckets API: Basic tests for openOrCreate(), keys(), delete().
-// META: global=window,worker
-
-'use strict';
-
-// This test is for initial IDL version optimized for debugging.
-// Split and add extensive testing once implementation for the endpoints are
-// added and method definitions are more defined.
-promise_test(async testCase => {
-  await navigator.storageBuckets.openOrCreate('bucket_name');
-  testCase.add_cleanup(async () => {
-    await navigator.storageBuckets.delete('bucket_name');
-  });
-
-  const buckets = await navigator.storageBuckets.keys();
-  assert_equals(buckets.length, 1);
-  assert_equals(buckets[0], 'bucket_name');
-}, 'openOrCreate() stores bucket name');
-
-promise_test(async testCase => {
-  await navigator.storageBuckets.openOrCreate('bucket_name');
-  await navigator.storageBuckets.openOrCreate('bucket_name');
-  testCase.add_cleanup(async () => {
-    await navigator.storageBuckets.delete('bucket_name');
-  });
-
-  const buckets = await navigator.storageBuckets.keys();
-  assert_equals(buckets.length, 1);
-  assert_equals(buckets[0], 'bucket_name');
-}, 'openOrCreate() does not store duplicate bucket name');
-
-promise_test(async testCase => {
-  await navigator.storageBuckets.openOrCreate('bucket_name3');
-  await navigator.storageBuckets.openOrCreate('bucket_name1');
-  await navigator.storageBuckets.openOrCreate('bucket_name2');
-  testCase.add_cleanup(async () => {
-    await navigator.storageBuckets.delete('bucket_name1');
-    await navigator.storageBuckets.delete('bucket_name2');
-    await navigator.storageBuckets.delete('bucket_name3');
-  });
-
-  const buckets = await navigator.storageBuckets.keys();
-  assert_equals(buckets.length, 3);
-  assert_equals(buckets[0], 'bucket_name1');
-  assert_equals(buckets[1], 'bucket_name2');
-  assert_equals(buckets[2], 'bucket_name3');
-}, 'keys() lists all stored bucket names alphabetically');
-
-promise_test(async testCase => {
-  await navigator.storageBuckets.openOrCreate('bucket_name1');
-  await navigator.storageBuckets.openOrCreate('bucket_name2');
-  testCase.add_cleanup(async () => {
-    await navigator.storageBuckets.delete('bucket_name1');
-    await navigator.storageBuckets.delete('bucket_name2');
-  });
-
-  let buckets = await navigator.storageBuckets.keys();
-  assert_equals(buckets.length, 2);
-  assert_equals(buckets[0], 'bucket_name1');
-  assert_equals(buckets[1], 'bucket_name2');
-
-  await navigator.storageBuckets.delete('bucket_name1');
-
-  buckets = await navigator.storageBuckets.keys();
-  assert_equals(buckets.length, 1);
-  assert_equals(buckets[0], 'bucket_name2');
-}, 'delete() removes stored bucket name');
-
-promise_test(async testCase => {
-  await navigator.storageBuckets.openOrCreate('bucket_name');
-  testCase.add_cleanup(async () => {
-    await navigator.storageBuckets.delete('bucket_name');
-  });
-
-  let buckets = await navigator.storageBuckets.keys();
-  assert_equals(buckets.length, 1);
-  assert_equals(buckets[0], 'bucket_name');
-
-  await navigator.storageBuckets.delete('does-not-exist');
-
-  buckets = await navigator.storageBuckets.keys();
-  assert_equals(buckets.length, 1);
-  assert_equals(buckets[0], 'bucket_name');
-}, 'delete() does nothing if bucket name does not exist');
diff --git a/tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1172059.html b/tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1172059.html
new file mode 100644
index 00000000000..1c788ab3d81
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1172059.html
@@ -0,0 +1,3 @@
+<!doctype html>
+<p>This test should not crash.</p>
+<svg><use href="support/used.svg#svg-text"></use></svg>
diff --git a/tests/wpt/web-platform-tests/svg/crashtests/support/used.svg b/tests/wpt/web-platform-tests/svg/crashtests/support/used.svg
new file mode 100644
index 00000000000..37ce3f57629
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/crashtests/support/used.svg
@@ -0,0 +1,3 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <text id="svg-text" x="0" y="20" style="font-family: sans-serif">Text</text>
+</svg>
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/interfaces/foreignObject-graphics.svg b/tests/wpt/web-platform-tests/svg/extensibility/interfaces/foreignObject-graphics.svg
index 000c107b53b..7745e91f0a3 100644
--- a/tests/wpt/web-platform-tests/svg/extensibility/interfaces/foreignObject-graphics.svg
+++ b/tests/wpt/web-platform-tests/svg/extensibility/interfaces/foreignObject-graphics.svg
@@ -12,7 +12,7 @@
   <h:script><![CDATA[
   test(function() {
     var target = document.getElementById('target');
-    assert_equals(target.__proto__.__proto__, SVGGraphicsElement.prototype);
+    assert_equals(Object.getPrototypeOf(Object.getPrototypeOf(target)), SVGGraphicsElement.prototype);
   });
   ]]></h:script>
 </svg>
diff --git a/tests/wpt/web-platform-tests/svg/path/interfaces/SVGAnimatedPathData-removed.svg b/tests/wpt/web-platform-tests/svg/path/interfaces/SVGAnimatedPathData-removed.svg
index c8d187cd3d2..b9e62177cb9 100644
--- a/tests/wpt/web-platform-tests/svg/path/interfaces/SVGAnimatedPathData-removed.svg
+++ b/tests/wpt/web-platform-tests/svg/path/interfaces/SVGAnimatedPathData-removed.svg
@@ -14,7 +14,7 @@
     assert_equals(window.SVGAnimatedPathData, undefined);
 
     var track = document.getElementById('track');
-    assert_equals(track.__proto__, SVGPathElement.prototype);
+    assert_equals(Object.getPrototypeOf(track), SVGPathElement.prototype);
     assert_equals(track.pathSegList, undefined);
     assert_equals(track.normalizedPathSegList, undefined);
     assert_equals(track.animatedPathSegList, undefined);
diff --git a/tests/wpt/web-platform-tests/svg/struct/UnknownElement/interface.svg b/tests/wpt/web-platform-tests/svg/struct/UnknownElement/interface.svg
index 862e5fde273..987f20c5e4c 100644
--- a/tests/wpt/web-platform-tests/svg/struct/UnknownElement/interface.svg
+++ b/tests/wpt/web-platform-tests/svg/struct/UnknownElement/interface.svg
@@ -13,7 +13,7 @@
 <h:script><![CDATA[
 test(function() {
     var e = document.getElementById("target");
-    assert_equals(e.__proto__, SVGUnknownElement.prototype);
+    assert_equals(Object.getPrototypeOf(e), SVGUnknownElement.prototype);
 });
 ]]></h:script>
 </svg>
diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_tools_unittest.sh b/tests/wpt/web-platform-tests/tools/ci/ci_tools_unittest.sh
index 366dcf66de8..a4d5cbb7de1 100755
--- a/tests/wpt/web-platform-tests/tools/ci/ci_tools_unittest.sh
+++ b/tests/wpt/web-platform-tests/tools/ci/ci_tools_unittest.sh
@@ -6,9 +6,9 @@ WPT_ROOT=$SCRIPT_DIR/../..
 cd $WPT_ROOT
 
 run_applicable_tox () {
-    # instead of just running TOXENV (e.g., py27)
+    # instead of just running TOXENV (e.g., py38)
     # run all environments that start with TOXENV
-    # (e.g., py27-firefox as well as py27)
+    # (e.g., py38-firefox as well as py38)
     local OLD_TOXENV="$TOXENV"
     unset TOXENV
     local RUN_ENVS=$(tox -l | grep "^${OLD_TOXENV}\(\-\|\$\)" | tr "\n" ",")
diff --git a/tests/wpt/web-platform-tests/tools/py27-flake8.ini b/tests/wpt/web-platform-tests/tools/py27-flake8.ini
deleted file mode 100644
index dd6ceb6fea4..00000000000
--- a/tests/wpt/web-platform-tests/tools/py27-flake8.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-[flake8]
-select = E,W,F,N
-# E128: continuation line under-indented for visual indent
-# E129: visually indented line with same indent as next logical line
-# E226: missing whitespace around arithmetic operator
-# E231: missing whitespace after ‘,’, ‘;’, or ‘:’
-# E251: unexpected spaces around keyword / parameter equals
-# E265: block comment should start with ‘# ‘
-# E302: expected 2 blank lines, found 0
-# E303: too many blank lines (3)
-# E305: expected 2 blank lines after end of function or class
-# E402: module level import not at top of file
-# E731: do not assign a lambda expression, use a def
-# W504: line break after binary operator
-# W601: .has_key() is deprecated, use ‘in’
-# W605: invalid escape sequence
-# W606: 'async' and 'await' are reserved keywords starting with Python 3.7
-# N801: class names should use CapWords convention
-# N802: function name should be lowercase
-# N806: variable in function should be lowercase
-ignore = E128,E129,E226,E231,E251,E265,E302,E303,E305,E402,E731,W504,W601,W605,W606,N801,N802,N806
-exclude =
-    .tox,
-    pywebsocket,
-    quic,
-    third_party,
-    wptserve/docs/conf.py,
-    wptserve/tests/functional/docroot/invalid.py
-max-line-length = 141
diff --git a/tests/wpt/web-platform-tests/tools/tox.ini b/tests/wpt/web-platform-tests/tools/tox.ini
index c72d728239a..f3b0c4dd3ef 100644
--- a/tests/wpt/web-platform-tests/tools/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,py36,py37,py38,{py27,py35,py36,py37,py38}-flake8,py38-mypy2,{py35,py38}-mypy3
+envlist = py36,py37,py38,{py36,py37,py38}-flake8,{py36,py38}-mypy3
 skipsdist=True
 skip_missing_interpreters = False
 
@@ -24,14 +24,6 @@ passenv =
   PY_COLORS
   TASKCLUSTER_ROOT_URL
 
-[testenv:py27-flake8]
-deps = -rrequirements_flake8.txt
-commands = flake8 --append-config={toxinidir}/py27-flake8.ini {posargs}
-
-[testenv:py35-flake8]
-deps = -rrequirements_flake8.txt
-commands = flake8 --append-config={toxinidir}/py3-flake8.ini {posargs}
-
 [testenv:py36-flake8]
 deps = -rrequirements_flake8.txt
 commands = flake8 --append-config={toxinidir}/py3-flake8.ini {posargs}
@@ -44,18 +36,6 @@ commands = flake8 --append-config={toxinidir}/py3-flake8.ini {posargs}
 deps = -rrequirements_flake8.txt
 commands = flake8 --append-config={toxinidir}/py3-flake8.ini {posargs}
 
-[testenv:py38-mypy2]
-deps = -rrequirements_mypy.txt
-changedir = {toxinidir}/..
-commands =
-  mypy --config-file={toxinidir}/mypy.ini --no-incremental --py2 -p tools.manifest -p tools.lint -p tools.gitignore
-
-[testenv:py35-mypy3]
-deps = -rrequirements_mypy.txt
-changedir = {toxinidir}/..
-commands =
-  mypy --config-file={toxinidir}/mypy.ini --no-incremental -p tools.manifest -p tools.lint -p tools.gitignore
-
 [testenv:py38-mypy3]
 deps = -rrequirements_mypy.txt
 changedir = {toxinidir}/..
diff --git a/tests/wpt/web-platform-tests/tools/wave/tox.ini b/tests/wpt/web-platform-tests/tools/wave/tox.ini
index 2feec8d1a4a..c70a46cc3c9 100644
--- a/tests/wpt/web-platform-tests/tools/wave/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/wave/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,py36,py37,py38
+envlist = py36,py37,py38
 skipsdist=True
 skip_missing_interpreters = False
 
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tox.ini b/tests/wpt/web-platform-tests/tools/wpt/tox.ini
index 03f4ab5aba0..c2f745b5704 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/wpt/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,py36,py37,py38
+envlist = py36,py37,py38
 skipsdist=True
 skip_missing_interpreters = False
 
diff --git a/tests/wpt/web-platform-tests/tools/wpt/wpt.py b/tests/wpt/web-platform-tests/tools/wpt/wpt.py
index 9bc6ce6ce9e..d47c91ce316 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/wpt.py
@@ -50,10 +50,6 @@ def parse_args(argv, commands=load_commands()):
                         dest="skip_venv_setup",
                         help="Whether to use the virtualenv as-is. Must set --venv as well")
     parser.add_argument("--debug", action="store_true", help="Run the debugger in case of an exception")
-    parser.add_argument("--py3", action="store_true",
-                        help="Run with Python 3 (requires a `python3` binary on the PATH)")
-    parser.add_argument("--py2", action="store_true",
-                        help="Run with Python 2 (requires a `python2` binary on the PATH)")
     subparsers = parser.add_subparsers(dest="command")
     for command, props in iteritems(commands):
         subparsers.add_parser(command, help=props["help"], add_help=False)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini b/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini
index b39b5eb7e95..2b9bca17fa4 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini
@@ -2,7 +2,7 @@
 xfail_strict=true
 
 [tox]
-envlist = py27-{base,chrome,edge,firefox,ie,opera,safari,sauce,servo,webkit,webkitgtk_minibrowser,epiphany},{py35,py36,py37,py38}-base
+envlist = py38-{base,chrome,edge,firefox,ie,opera,safari,sauce,servo,webkit,webkitgtk_minibrowser,epiphany},{py36,py37}-base
 skip_missing_interpreters = False
 
 [testenv]
diff --git a/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html b/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html
index f6b9798f502..64b04656d35 100644
--- a/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html
@@ -14,7 +14,7 @@
     createScript: t => t,
   });
   function stringify(arg) {
-    return "textContent" in arg.__proto__ ? arg.textContent : arg.toString()
+    return "textContent" in Object.getPrototypeOf(arg) ? arg.textContent : arg.toString()
   }
 
   // This test case mirrors the block-Node-multiple-arguments case except
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-Node-multiple-arguments.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-Node-multiple-arguments.tentative.html
index f76b3587512..c3e7671534e 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-Node-multiple-arguments.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-Node-multiple-arguments.tentative.html
@@ -15,7 +15,7 @@
     createScript: t => t,
   });
   function stringify(arg) {
-    return "textContent" in arg.__proto__ ? arg.textContent : arg.toString()
+    return "textContent" in Object.getPrototypeOf(arg) ? arg.textContent : arg.toString()
   }
 
   // Test all combinations of:
diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-constructor.any.js b/tests/wpt/web-platform-tests/url/urlsearchparams-constructor.any.js
index f9878373e5e..d482911350b 100644
--- a/tests/wpt/web-platform-tests/url/urlsearchparams-constructor.any.js
+++ b/tests/wpt/web-platform-tests/url/urlsearchparams-constructor.any.js
@@ -29,7 +29,7 @@ test(() => {
 test(() => {
     var params = new URLSearchParams('');
     assert_true(params != null, 'constructor returned non-null value.');
-    assert_equals(params.__proto__, URLSearchParams.prototype, 'expected URLSearchParams.prototype as prototype.');
+    assert_equals(Object.getPrototypeOf(params), URLSearchParams.prototype, 'expected URLSearchParams.prototype as prototype.');
 }, "URLSearchParams constructor, empty string as argument")
 
 test(() => {
diff --git a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
index 659f74ed8b1..35154e287d8 100644
--- a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
+++ b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
@@ -9,14 +9,9 @@
 //   --enable-blink-features=MojoJS,MojoJSTest
 
 async function loadChromiumResources() {
-  const chromiumResources = [
-  '/gen/services/device/public/mojom/nfc.mojom.js',
-  ];
-
-  await loadMojoResources(chromiumResources);
   await loadScript('/resources/testdriver.js');
   await loadScript('/resources/testdriver-vendor.js');
-  await loadScript('/resources/chromium/nfc-mock.js');
+  await import('/resources/chromium/nfc-mock.js');
 }
 
 async function initialize_nfc_tests() {
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-capture-video.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-capture-video.https.html
new file mode 100644
index 00000000000..8d2579602a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-capture-video.https.html
@@ -0,0 +1,73 @@
+<!doctype html>
+<html>
+<head>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="RTCPeerConnection-helper.js"></script>
+</head>
+<body>
+<script>
+  'use strict';
+
+// This test checks that <video> capture works via PeerConnection.
+
+promise_test(async t => {
+  const sourceVideo = document.createElement('video');
+  sourceVideo.src = "/media/test-v-128k-320x240-24fps-8kfr.webm";
+  sourceVideo.loop = true;
+
+  const onCanPlay = new Promise(r => sourceVideo.oncanplay = r);
+  await onCanPlay;
+
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  // Attach video to pc1.
+  const stream = sourceVideo.captureStream();
+  const tracks = stream.getTracks();
+  pc1.addTrack(tracks[0]);
+
+  const destVideo = document.createElement('video');
+  destVideo.autoplay = true;
+
+  // Setup pc1->pc2.
+  const haveTrackEvent1 = new Promise(r => pc2.ontrack = r);
+  exchangeIceCandidates(pc1, pc2);
+  await pc1.setLocalDescription();
+  await pc2.setRemoteDescription(pc1.localDescription);
+  await pc2.setLocalDescription();
+  await pc1.setRemoteDescription(pc2.localDescription);
+
+  // Display pc2 received track in video element.
+  const onLoadedMetadata = new Promise(r => destVideo.onloadedmetadata = r);
+  destVideo.srcObject = new MediaStream([(await haveTrackEvent1).track]);
+
+  // Start playback and wait for video on the other side.
+  sourceVideo.play();
+  await onLoadedMetadata;
+
+  // Wait until the video has non-zero resolution and some non-black pixels.
+  await new Promise(p => {
+    function checkColor()  {
+        if (destVideo.width > 0 && getVideoSignal(destVideo).toFixed() > 0.0)
+          p();
+        else
+         t.step_timeout(checkColor, 0);
+    }
+    checkColor();
+  });
+
+  // Uses Helper.js GetVideoSignal to query |destVideo| pixel value at a certain position.
+  const pixelValue = getVideoSignal(destVideo);
+
+  // Expected value computed based on GetVideoSignal code, which takes green pixel data
+  // with coefficient 0.72.
+  assert_approx_equals(pixelValue, 0.72*255, 2);
+  }, "Capturing a video element and sending it via PeerConnection");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-relay-canvas.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-relay-canvas.https.html
new file mode 100644
index 00000000000..6e9cd068220
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-relay-canvas.https.html
@@ -0,0 +1,84 @@
+<!doctype html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>Relay canvas via PeerConnections</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="RTCPeerConnection-helper.js"></script>
+<script>
+  'use strict';
+
+// This test checks that canvas capture works relayed between several peer connections.
+
+function GreenFrameWebGL(width, height) {
+  const canvas =
+      Object.assign(document.createElement('canvas'), {width, height});
+  const ctx = canvas.getContext('webgl');
+  if (ctx === null) return;
+  requestAnimationFrame(function draw () {
+    ctx.clearColor(0.0, 1.0, 0.0, 1.0);
+    ctx.clear(ctx.COLOR_BUFFER_BIT);
+    requestAnimationFrame(draw);
+  });
+  return canvas.captureStream();
+}
+
+
+
+promise_test(async t => {
+
+  // Build a chain
+  // canvas -track-> pc1 -network-> pcRelayIn -track->
+  //       pcRelayOut -network-> pc2 -track-> video
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pcRelayIn = new RTCPeerConnection();
+  t.add_cleanup(() => pcRelayIn.close());
+
+  const pcRelayOut = new RTCPeerConnection();
+  t.add_cleanup(() => pcRelayOut.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  // Attach canvas to pc1.
+  const stream = GreenFrameWebGL(640, 480);
+  const [track] = stream.getTracks();
+  pc1.addTrack(track);
+
+  const v = document.createElement('video');
+  v.autoplay = true;
+
+  // Setup pc1->pcRelayIn video stream.
+  const haveTrackEvent1 = new Promise(r => pcRelayIn.ontrack = r);
+  exchangeIceCandidates(pc1, pcRelayIn);
+  await pc1.setLocalDescription();
+  await pcRelayIn.setRemoteDescription(pc1.localDescription);
+  await pcRelayIn.setLocalDescription();
+  await pc1.setRemoteDescription(pcRelayIn.localDescription);
+
+  // Plug output of pcRelayIn to pcRelayOut.
+  pcRelayOut.addTrack((await haveTrackEvent1).track);
+
+  // Setup pcRelayOut->pc2 video stream.
+  const haveTrackEvent2 = new Promise(r => pc2.ontrack = r);
+  exchangeIceCandidates(pcRelayOut, pc2);
+  await pcRelayOut.setLocalDescription();
+  await pc2.setRemoteDescription(pcRelayOut.localDescription);
+  await pc2.setLocalDescription();
+  await pcRelayOut.setRemoteDescription(pc2.localDescription);
+
+  // Display pc2 received track in video element.
+  v.srcObject = new MediaStream([(await haveTrackEvent2).track]);
+  await new Promise(r => v.onloadedmetadata = r);
+
+  // Wait some time to ensure that frames got through.
+  await new Promise(resolve => t.step_timeout(resolve, 1000));
+
+  // Uses Helper.js GetVideoSignal to query |v| pixel value at a certain position.
+  const pixelValue = getVideoSignal(v);
+
+  // Expected value computed based on GetVideoSignal code, which takes green pixel data
+  // with coefficient 0.72.
+  assert_approx_equals(pixelValue, 0.72*255, 2);
+  }, "Two PeerConnections relaying a canvas source");
+</script>
diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js b/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js
index fc4ca7d0d37..8ca7918298b 100644
--- a/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js
+++ b/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js
@@ -204,42 +204,19 @@ function forEachWebxrObject(callback) {
 
 // Code for loading test API in Chromium.
 async function loadChromiumResources() {
-  const chromiumResources = [
-    '/gen/mojo/public/mojom/base/time.mojom.js',
-    '/gen/mojo/public/mojom/base/shared_memory.mojom.js',
-    '/gen/mojo/public/mojom/base/unguessable_token.mojom.js',
-    '/gen/gpu/ipc/common/sync_token.mojom.js',
-    '/gen/gpu/ipc/common/mailbox.mojom.js',
-    '/gen/gpu/ipc/common/mailbox_holder.mojom.js',
-    '/gen/ui/gfx/geometry/mojom/geometry.mojom.js',
-    '/gen/ui/gfx/mojom/native_handle_types.mojom.js',
-    '/gen/ui/gfx/mojom/buffer_types.mojom.js',
-    '/gen/ui/gfx/mojom/color_space.mojom.js',
-    '/gen/ui/gfx/mojom/display_color_spaces.mojom.js',
-    '/gen/ui/gfx/mojom/gpu_fence_handle.mojom.js',
-    '/gen/ui/gfx/mojom/transform.mojom.js',
-    '/gen/ui/display/mojom/display.mojom.js',
-    '/gen/device/gamepad/public/mojom/gamepad.mojom.js',
-    '/gen/device/vr/public/mojom/vr_service.mojom.js',
-  ];
+  await loadScript('/resources/chromium/webxr-test-math-helper.js');
+  await import('/resources/chromium/webxr-test.js');
+  await loadScript('/resources/testdriver.js');
+  await loadScript('/resources/testdriver-vendor.js');
 
-  let extraResources = [
-    '/resources/chromium/webxr-test-math-helper.js',
-    '/resources/chromium/webxr-test.js',
-    '/resources/testdriver.js',
-    '/resources/testdriver-vendor.js',
-  ];
   // This infrastructure is also used by Chromium-specific internal tests that
   // may need additional resources (e.g. internal API extensions), this allows
   // those tests to rely on this infrastructure while ensuring that no tests
   // make it into public WPTs that rely on APIs outside of the webxr test API.
   if (typeof(additionalChromiumResources) !== 'undefined') {
-    extraResources = extraResources.concat(additionalChromiumResources);
-  }
-
-  await loadMojoResources(chromiumResources);
-  for (const path of extraResources) {
-    await loadScript(path);
+    for (const path of additionalChromiumResources) {
+      await loadScript(path);
+    }
   }
 
   xr_debug = navigator.xr.test.Debug;
diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker-MessageEvent-source.any.js b/tests/wpt/web-platform-tests/workers/SharedWorker-MessageEvent-source.any.js
index faf48cf9386..e47fd065355 100644
--- a/tests/wpt/web-platform-tests/workers/SharedWorker-MessageEvent-source.any.js
+++ b/tests/wpt/web-platform-tests/workers/SharedWorker-MessageEvent-source.any.js
@@ -1,6 +1,6 @@
 // META: global=sharedworker
 const t = async_test("Make sure that MessageEvent.source is properly set in connect event.");
 onconnect = t.step_func_done((event) => {
-  assert_equals(event.__proto__, MessageEvent.prototype);
+  assert_equals(Object.getPrototypeOf(event), MessageEvent.prototype);
   assert_equals(event.source, event.ports[0]);
 });
diff --git a/tests/wpt/web-platform-tests/workers/Worker-constructor-proto.any.js b/tests/wpt/web-platform-tests/workers/Worker-constructor-proto.any.js
index 5a4a6aa1137..297fe6c58b4 100644
--- a/tests/wpt/web-platform-tests/workers/Worker-constructor-proto.any.js
+++ b/tests/wpt/web-platform-tests/workers/Worker-constructor-proto.any.js
@@ -2,6 +2,6 @@
 test(() => {
   const proto = {};
   assert_equals(String(Object.getPrototypeOf(WorkerLocation)).replace(/\n/g, " ").replace(/\s\s+/g, " "), "function () { [native code] }");
-  WorkerLocation.__proto__ = proto;
+  Object.setPrototypeOf(WorkerLocation, proto);
   assert_equals(Object.getPrototypeOf(WorkerLocation), proto);
 }, 'Tests that setting the proto of a built in constructor is not reset.');
diff --git a/tests/wpt/web-platform-tests/wpt b/tests/wpt/web-platform-tests/wpt
index 36d0bed48ed..eac84b62e97 100755
--- a/tests/wpt/web-platform-tests/wpt
+++ b/tests/wpt/web-platform-tests/wpt
@@ -1,34 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 if __name__ == "__main__":
     import sys
-    from tools.wpt import wpt
-    args, extra = wpt.parse_args(sys.argv[1:])
-    commands = wpt.load_commands()
-    py3only = commands[args.command]["py3only"]
+    if (sys.version_info.major < 3 or
+            (sys.version_info.major == 3 and sys.version_info.minor < 6)):
+        sys.stderr.write("wpt requires Python 3.6 or higher\n")
+        sys.exit(1)
 
-    if (args.py2) and sys.version_info.major > 2:
-        if py3only:
-            sys.stderr.write("This command only works with Python 3\n")
-            sys.exit(1)
-        from subprocess import call
-        try:
-            sys.exit(call(['python2'] + sys.argv))
-        except OSError as e:
-            if e.errno == 2:
-                sys.stderr.write("python2 is needed to run this command\n")
-                sys.exit(1)
-            else:
-                raise
-    elif (not args.py2) and sys.version_info.major < 3:
-        from subprocess import call
-        try:
-            sys.exit(call(['python3'] + sys.argv))
-        except OSError as e:
-            if e.errno == 2:
-                sys.stderr.write("python3 is needed to run this command\n")
-                sys.exit(1)
-            else:
-                raise
-    else:
-        wpt.main()
+    from tools.wpt import wpt
+    wpt.main()
diff --git a/tests/wpt/web-platform-tests/xhr/responsexml-document-properties.htm b/tests/wpt/web-platform-tests/xhr/responsexml-document-properties.htm
index c27a4482cd2..cb2edb777dd 100644
--- a/tests/wpt/web-platform-tests/xhr/responsexml-document-properties.htm
+++ b/tests/wpt/web-platform-tests/xhr/responsexml-document-properties.htm
@@ -39,7 +39,7 @@
       function runTest(name, value){
         test(function(){
           if (name == "all") {
-            assert_equals(client.responseXML[name].__proto__, value.prototype)
+            assert_equals(Object.getPrototypeOf(client.responseXML[name]), value.prototype)
           } else {
             assert_equals(client.responseXML[name], value)
           }