From 75736751d9ffa1489c67387b89b79d7ebd06611c Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 30 Oct 2017 09:31:22 -0400
Subject: [PATCH 1/2] Update web-platform-tests to revision
 14cfa4d648cc1c853b4153268df672d21425f8c1

---
 .../wpt/css-tests/tools/manifest/download.py  |  130 +
 tests/wpt/metadata/MANIFEST.json              | 9466 ++++++++---------
 .../fetch/api/basic/keepalive.html.ini        |    4 +
 .../api/request/request-keepalive.html.ini    |    7 +
 .../wpt/metadata/html/dom/interfaces.html.ini |    9 +
 .../dialog-return-value.html.ini              |    4 +
 .../show-modal-focusing-steps.html.ini        |    5 +
 .../dynamic-imports-error.html.ini            |    3 -
 .../dynamic-imports-fetch-error.sub.html.ini  |    2 +
 .../dynamic-imports-script-error.html.ini     |    2 +
 .../import-meta/import-meta-url.html.ini      |    2 +
 tests/wpt/metadata/mozilla-sync               |    4 +-
 .../generic/iframe-inheritance.html.ini       |    5 +
 .../tests/css/test_font_family_parsing.html   |   11 -
 tests/wpt/web-platform-tests/.travis.yml      |    9 +
 .../IndexedDB/idbcursor-request-source.html   |   31 +
 .../IndexedDB/idbindex-request-source.html    |   34 +
 .../idbobjectstore-request-source.html        |   39 +
 .../Accelerometer_insecure_context.html       |    2 +-
 .../accelerometer/idlharness.https.html       |    7 +-
 tests/wpt/web-platform-tests/acid/README.md   |   17 +
 .../web-platform-tests/acid/acid2/404.html    |    2 +
 .../acid/acid2/reference.html                 |   17 +
 .../acid/acid2/reference.png                  |  Bin 0 -> 2261 bytes
 .../acid/acid2/reftest.html                   |   15 +
 .../web-platform-tests/acid/acid2/test.html   |  150 +
 .../web-platform-tests/acid/acid3/empty.css   |    8 +
 .../acid/acid3/empty.css.headers              |    1 +
 .../web-platform-tests/acid/acid3/empty.html  |    1 +
 .../web-platform-tests/acid/acid3/empty.png   |  Bin 0 -> 260 bytes
 .../web-platform-tests/acid/acid3/empty.txt   |    1 +
 .../web-platform-tests/acid/acid3/empty.xml   |    4 +
 .../acid/acid3/empty.xml.headers              |    1 +
 .../web-platform-tests/acid/acid3/favicon.ico |    0
 .../acid/acid3/favicon.ico.headers            |    1 +
 .../acid/acid3/reference.png                  |  Bin 0 -> 1771 bytes
 .../acid/acid3/reference.sub.html             |   21 +
 .../acid/acid3/support-a.png                  |  Bin 0 -> 2312 bytes
 .../acid/acid3/support-b.png                  |    1 +
 .../acid/acid3/support-b.png.headers          |    2 +
 .../wpt/web-platform-tests/acid/acid3/svg.xml |    1 +
 .../acid/acid3/svg.xml.headers                |    1 +
 .../web-platform-tests/acid/acid3/test.html   | 3510 ++++++
 .../wpt/web-platform-tests/acid/acid3/xhtml.1 |   11 +
 .../acid/acid3/xhtml.1.headers                |    1 +
 .../wpt/web-platform-tests/acid/acid3/xhtml.2 |   11 +
 .../acid/acid3/xhtml.2.headers                |    1 +
 .../wpt/web-platform-tests/acid/acid3/xhtml.3 |   11 +
 .../acid/acid3/xhtml.3.headers                |    1 +
 .../AmbientLightSensor_insecure_context.html  |    2 +-
 .../ambient-light/idlharness.https.html       |   59 +-
 ...ontent-and-allowed-schemes.https.window.js |    7 +-
 .../blink-contrib-2/allowed.css               |    3 -
 .../blink-contrib-2/base-uri-allow.sub.html   |   36 -
 .../base-uri-allow.sub.html.sub.headers       |    6 -
 .../blink-contrib-2/base-uri-deny.sub.html    |   33 -
 .../base-uri-deny.sub.html.sub.headers        |    6 -
 ...rm-action-src-allowed.sub.html.sub.headers |    6 -
 ...rm-action-src-blocked.sub.html.sub.headers |    6 -
 ...n-src-default-ignored.sub.html.sub.headers |    6 -
 ...ction-src-get-allowed.sub.html.sub.headers |    6 -
 ...ction-src-get-blocked.sub.html.sub.headers |    6 -
 ...rc-javascript-blocked.sub.html.sub.headers |    6 -
 ...-src-redirect-blocked.sub.html.sub.headers |    6 -
 .../meta-outside-head.sub.html.sub.headers    |    6 -
 ...types-mismatched-data.sub.html.sub.headers |    6 -
 ...ntypes-mismatched-url.sub.html.sub.headers |    6 -
 ...ugintypes-notype-data.sub.html.sub.headers |    6 -
 ...lugintypes-notype-url.sub.html.sub.headers |    6 -
 ...intypes-nourl-allowed.sub.html.sub.headers |    6 -
 .../plugintypes-nourl-blocked.sub.html        |   23 -
 ...intypes-nourl-blocked.sub.html.sub.headers |    6 -
 ...-src-wildcards-disallowed.html.sub.headers |    6 -
 .../scripthash-allowed.sub.html.sub.headers   |    6 -
 ...ipthash-basic-blocked.sub.html.sub.headers |    6 -
 .../scripthash-default-src.sub.html           |   15 -
 ...cripthash-default-src.sub.html.sub.headers |    6 -
 ...h-ignore-unsafeinline.sub.html.sub.headers |    6 -
 ...unicode-normalization.sub.html.sub.headers |    6 -
 .../scriptnonce-allowed.sub.html.sub.headers  |    6 -
 ...tnonce-and-scripthash.sub.html.sub.headers |    6 -
 ...ptnonce-basic-blocked.sub.html.sub.headers |    6 -
 ...e-ignore-unsafeinline.sub.html.sub.headers |    6 -
 .../scriptnonce-redirect.sub.html.sub.headers |    6 -
 ...ck-cross-origin-image-from-script.sub.html |   27 -
 ...gin-image-from-script.sub.html.sub.headers |    6 -
 ...iolation-block-cross-origin-image.sub.html |   29 -
 ...ck-cross-origin-image.sub.html.sub.headers |    6 -
 ...violation-block-image-from-script.sub.html |   29 -
 ...ock-image-from-script.sub.html.sub.headers |    6 -
 ...curitypolicyviolation-block-image.sub.html |   34 -
 ...violation-block-image.sub.html.sub.headers |    6 -
 .../stylehash-allowed.sub.html.sub.headers    |    6 -
 ...ylehash-basic-blocked.sub.html.sub.headers |    6 -
 ...stylehash-default-src.sub.html.sub.headers |    6 -
 .../stylenonce-allowed.sub.html.sub.headers   |    6 -
 .../stylenonce-blocked.sub.html.sub.headers   |    6 -
 ...rls-do-not-match-self.sub.html.sub.headers |    6 -
 .../blob-urls-match-blob.sub.html.sub.headers |    6 -
 ...der-and-meta-policies.sub.html.sub.headers |    6 -
 ...combine-multiple-header-policies.html.asis |   60 -
 ...ct-src-beacon-allowed.sub.html.sub.headers |    6 -
 .../connect-src-beacon-blocked.sub.html       |   40 -
 ...ct-src-beacon-blocked.sub.html.sub.headers |    6 -
 ...n-redirect-to-blocked.sub.html.sub.headers |    6 -
 ...c-eventsource-allowed.sub.html.sub.headers |    6 -
 .../connect-src-eventsource-blocked.sub.html  |   40 -
 ...c-eventsource-blocked.sub.html.sub.headers |    6 -
 ...e-redirect-to-blocked.sub.html.sub.headers |    6 -
 ...src-websocket-allowed.sub.html.sub.headers |    6 -
 ...src-websocket-blocked.sub.html.sub.headers |    6 -
 ...mlhttprequest-allowed.sub.html.sub.headers |    6 -
 ...onnect-src-xmlhttprequest-blocked.sub.html |   37 -
 ...mlhttprequest-blocked.sub.html.sub.headers |    6 -
 ...t-redirect-to-blocked.sub.html.sub.headers |    6 -
 ...lt-src-inline-allowed.sub.html.sub.headers |    6 -
 .../default-src-inline-blocked.sub.html       |   27 -
 ...lt-src-inline-blocked.sub.html.sub.headers |    6 -
 .../duplicate-directive.sub.html.sub.headers  |    6 -
 .../eval-allowed.sub.html.sub.headers         |    6 -
 ...cked-and-sends-report.sub.html.sub.headers |    6 -
 ...val-blocked-in-about-blank-iframe.sub.html |   10 -
 ...in-about-blank-iframe.sub.html.sub.headers |    6 -
 .../eval-blocked.sub.html.sub.headers         |    6 -
 .../eval-scripts-setInterval-allowed.sub.html |   31 -
 ...s-setInterval-allowed.sub.html.sub.headers |    6 -
 .../eval-scripts-setInterval-blocked.sub.html |   31 -
 ...s-setInterval-blocked.sub.html.sub.headers |    6 -
 .../eval-scripts-setTimeout-allowed.sub.html  |   30 -
 ...ts-setTimeout-allowed.sub.html.sub.headers |    6 -
 .../eval-scripts-setTimeout-blocked.sub.html  |   30 -
 ...ts-setTimeout-blocked.sub.html.sub.headers |    6 -
 ...rls-do-not-match-self.sub.html.sub.headers |    6 -
 ...urls-match-filesystem.sub.html.sub.headers |    6 -
 ...nk-allowed-by-default.sub.html.sub.headers |    6 -
 ...ank-allowed-by-scheme.sub.html.sub.headers |    6 -
 .../frame-src-allowed.sub.html.sub.headers    |    6 -
 .../frame-src-blocked.sub.html.sub.headers    |    6 -
 ...src-cross-origin-load.sub.html.sub.headers |    6 -
 .../function-constructor-allowed.sub.html     |   25 -
 ...n-constructor-allowed.sub.html.sub.headers |    6 -
 ...n-constructor-blocked.sub.html.sub.headers |    6 -
 .../blink-contrib/icon-allowed.sub.html       |   19 -
 .../icon-allowed.sub.html.sub.headers         |    6 -
 .../blink-contrib/icon-blocked.sub.html       |   17 -
 .../icon-blocked.sub.html.sub.headers         |    6 -
 .../blink-contrib/iframe-inside-csp.sub.html  |    1 -
 .../iframe-inside-csp.sub.html.sub.headers    |    6 -
 .../blink-contrib/image-allowed.sub.html      |   22 -
 .../image-allowed.sub.html.sub.headers        |    6 -
 .../blink-contrib/image-blocked.sub.html      |   23 -
 .../image-blocked.sub.html.sub.headers        |    6 -
 .../image-full-host-wildcard-allowed.sub.html |   22 -
 ...host-wildcard-allowed.sub.html.sub.headers |    6 -
 .../injected-inline-script-allowed.sub.html   |   22 -
 ...inline-script-allowed.sub.html.sub.headers |    6 -
 .../injected-inline-script-blocked.sub.html   |   20 -
 ...inline-script-blocked.sub.html.sub.headers |    6 -
 ...-inline-style-allowed.sub.html.sub.headers |    6 -
 ...-inline-style-blocked.sub.html.sub.headers |    6 -
 ...while-cloning-objects.sub.html.sub.headers |    6 -
 .../inline-style-allowed.sub.html.sub.headers |    6 -
 ...yle-attribute-allowed.sub.html.sub.headers |    6 -
 ...yle-attribute-blocked.sub.html.sub.headers |    6 -
 ...yle-attribute-on-html.sub.html.sub.headers |    6 -
 .../inline-style-blocked.sub.html.sub.headers |    6 -
 .../manifest-src-allowed.sub.html.sub.headers |    6 -
 .../manifest-src-blocked.sub.html.sub.headers |    6 -
 .../blink-contrib/media-src-allowed.sub.html  |   14 -
 .../media-src-allowed.sub.html.sub.headers    |    6 -
 .../blink-contrib/media-src-blocked.sub.html  |   15 -
 .../media-src-blocked.sub.html.sub.headers    |    6 -
 .../media-src-track-block.sub.html            |   39 -
 ...media-src-track-block.sub.html.sub.headers |    6 -
 .../object-in-svg-foreignobject.sub.html      |   28 -
 ...-in-svg-foreignobject.sub.html.sub.headers |    6 -
 .../object-src-no-url-allowed.sub.html        |   23 -
 ...ct-src-no-url-allowed.sub.html.sub.headers |    6 -
 ...ct-src-no-url-blocked.sub.html.sub.headers |    6 -
 .../object-src-url-allowed.sub.html           |   23 -
 ...bject-src-url-allowed.sub.html.sub.headers |    6 -
 .../object-src-url-blocked.sub.html           |   23 -
 ...bject-src-url-blocked.sub.html.sub.headers |    6 -
 .../policy-does-not-affect-child.sub.html     |    1 -
 ...does-not-affect-child.sub.html.sub.headers |    6 -
 ...port-blocked-data-uri.sub.html.sub.headers |    6 -
 .../report-cross-origin-no-cookies.sub.html   |   24 -
 ...oss-origin-no-cookies.sub.html.sub.headers |    6 -
 .../report-disallowed-from-meta.sub.html      |   24 -
 .../report-same-origin-with-cookies.sub.html  |   24 -
 ...e-origin-with-cookies.sub.html.sub.headers |    6 -
 ...report-uri-from-inline-javascript.sub.html |   28 -
 ...rom-inline-javascript.sub.html.sub.headers |    6 -
 .../report-uri-from-javascript.sub.html       |   22 -
 ...t-uri-from-javascript.sub.html.sub.headers |    6 -
 .../blink-contrib/report-uri.sub.html         |    6 -
 .../report-uri.sub.html.sub.headers           |    6 -
 .../blink-contrib/resources/alert-fail.html   |    4 -
 .../blink-contrib/resources/alert-pass.html   |    4 -
 .../blink-contrib/resources/blue.css          |    3 -
 .../resources/generate-csp-report.html        |    7 -
 .../resources/go-to-echo-report.js            |    7 -
 .../blink-contrib/resources/inject-image.js   |    4 -
 .../blink-contrib/resources/inject-script.js  |    5 -
 .../resources/postmessage-fail.html           |    4 -
 .../resources/postmessage-pass.html           |    4 -
 .../blink-contrib/resources/script.js         |    2 -
 .../resources/set-cookie.js.sub.headers       |    1 -
 .../resources/simple-event-stream             |    1 -
 .../resources/simple-event-stream.headers     |    1 -
 .../blink-contrib/resources/track.vtt         |    1 -
 .../sandbox-allow-scripts-subframe.sub.html   |    3 -
 ...llow-scripts-subframe.sub.html.sub.headers |    6 -
 .../sandbox-allow-scripts.sub.html            |    6 -
 ...sandbox-allow-scripts.sub.html.sub.headers |    6 -
 .../sandbox-empty-subframe.sub.html           |    3 -
 ...andbox-empty-subframe.sub.html.sub.headers |    6 -
 .../blink-contrib/sandbox-empty.sub.html      |    6 -
 .../sandbox-empty.sub.html.sub.headers        |    6 -
 .../script-src-overrides-default-src.sub.html |   25 -
 ...overrides-default-src.sub.html.sub.headers |    6 -
 ...elf-doesnt-match-blob.sub.html.sub.headers |    6 -
 ...shared-worker-connect-src-allowed.sub.html |   43 -
 ...r-connect-src-allowed.sub.html.sub.headers |    6 -
 ...shared-worker-connect-src-blocked.sub.html |   50 -
 ...r-connect-src-blocked.sub.html.sub.headers |    6 -
 .../source-list-parsing-paths-03.sub.html     |   22 -
 ...list-parsing-paths-03.sub.html.sub.headers |    6 -
 .../srcdoc-doesnt-bypass-script-src.sub.html  |   22 -
 ...snt-bypass-script-src.sub.html.sub.headers |    6 -
 ...tar-doesnt-match-blob.sub.html.sub.headers |    6 -
 .../style-allowed.sub.html.sub.headers        |    6 -
 .../style-blocked.sub.html.sub.headers        |    6 -
 .../worker-connect-src-allowed.sub.html       |   33 -
 ...r-connect-src-allowed.sub.html.sub.headers |    6 -
 ...r-connect-src-blocked.sub.html.sub.headers |    6 -
 .../worker-eval-blocked.sub.html.sub.headers  |    6 -
 .../worker-from-guid.sub.html.sub.headers     |    6 -
 ...tion-function-blocked.sub.html.sub.headers |    6 -
 ...importscripts-blocked.sub.html.sub.headers |    6 -
 .../blink-contrib/worker-script-src.sub.html  |   33 -
 .../worker-script-src.sub.html.sub.headers    |    6 -
 ...r-set-timeout-blocked.sub.html.sub.headers |    6 -
 .../blink-contrib/xsl-blocked-expected.png    |  Bin 2840 -> 0 bytes
 ...xsl-unaffected-by-style-src-1-expected.png |  Bin 2840 -> 0 bytes
 .../blob-urls-do-not-match-self.sub.html      |   12 +-
 .../blob-urls-match-blob.sub.html             |    9 +-
 .../self-doesnt-match-blob.sub.html           |   20 +-
 .../star-doesnt-match-blob.sub.html           |   20 +-
 ...rc-about-blank-allowed-by-default.sub.html |   15 +-
 ...nk-allowed-by-default.sub.html.sub.headers |    6 -
 ...src-about-blank-allowed-by-scheme.sub.html |   15 +-
 ...ank-allowed-by-scheme.sub.html.sub.headers |    6 -
 .../child-src/child-src-allowed.sub.html      |    9 +-
 .../child-src-allowed.sub.html.sub.headers    |    6 -
 .../child-src/child-src-blocked.sub.html      |   11 +-
 .../child-src-blocked.sub.html.sub.headers    |    6 -
 .../child-src-conflicting-frame-src.sub.html  |    8 +-
 ...conflicting-frame-src.sub.html.sub.headers |    6 -
 .../child-src-cross-origin-load.sub.html      |    8 +-
 ...src-cross-origin-load.sub.html.sub.headers |    6 -
 .../child-src-redirect-blocked.sub.html       |    8 +-
 ...-src-redirect-blocked.sub.html.sub.headers |    6 -
 .../connect-src-beacon-allowed.sub.html       |   18 +-
 .../connect-src-beacon-blocked.sub.html       |   58 +-
 ...ct-src-beacon-redirect-to-blocked.sub.html |   25 +-
 .../connect-src-eventsource-allowed.sub.html  |   11 +-
 .../connect-src-eventsource-blocked.sub.html  |   98 +-
 ...c-eventsource-redirect-to-blocked.sub.html |   13 +-
 .../connect-src-websocket-allowed.sub.html    |    9 +-
 .../connect-src-websocket-blocked.sub.html    |   53 +-
 ...onnect-src-xmlhttprequest-allowed.sub.html |    9 +-
 ...onnect-src-xmlhttprequest-blocked.sub.html |  105 +-
 ...mlhttprequest-redirect-to-blocked.sub.html |   11 +-
 .../connect-src/resources/simple-event-stream |    1 +
 .../resources/simple-event-stream.headers     |    1 +
 ...shared-worker-connect-src-allowed.sub.html |   39 +
 ...shared-worker-connect-src-blocked.sub.html |   44 +
 .../shared-worker-make-xhr-allowed.sub.js     |    2 +-
 .../shared-worker-make-xhr-blocked.sub.js     |    2 +-
 ...worker-make-xhr-blocked.sub.js.sub.headers |    0
 .../support}/worker-make-xhr-blocked.sub.js   |    0
 ...worker-make-xhr-blocked.sub.js.sub.headers |    0
 .../support}/worker-make-xhr.sub.js           |    0
 .../worker-connect-src-allowed.sub.html       |   34 +
 .../worker-connect-src-blocked.sub.html       |   20 +-
 .../worker-from-guid.sub.html                 |   19 +-
 .../default-src-inline-allowed.sub.html       |   12 +-
 .../default-src-inline-blocked.sub.html       |   31 +
 .../form-action-src-allowed.sub.html          |   10 +-
 .../form-action-src-blocked.sub.html          |   12 +-
 .../form-action-src-default-ignored.sub.html  |   10 +-
 .../form-action-src-get-allowed.sub.html      |   11 +-
 .../form-action-src-get-blocked.sub.html      |   13 +-
 ...orm-action-src-javascript-blocked.sub.html |   12 +-
 ...rc-javascript-blocked.sub.html.sub.headers |    0
 .../form-action-src-redirect-blocked.sub.html |   12 +-
 ...rc-about-blank-allowed-by-default.sub.html |   18 +-
 ...src-about-blank-allowed-by-scheme.sub.html |   18 +-
 .../frame-src-allowed.sub.html                |   11 +-
 .../frame-src-blocked.sub.html                |   13 +-
 .../frame-src-cross-origin-load.sub.html      |   18 +-
 .../duplicate-directive.sub.html              |   10 +-
 ...filesystem-urls-do-not-match-self.sub.html |   16 +-
 .../filesystem-urls-match-filesystem.sub.html |   14 +-
 .../generic/generic-0_1-img-src.html          |    9 +-
 .../generic-0_1-img-src.html.sub.headers      |    6 -
 .../generic/generic-0_1-script-src.html       |    9 +-
 .../generic-0_1-script-src.html.sub.headers   |    6 -
 .../generic/generic-0_10.html                 |   10 +-
 .../generic/generic-0_10.html.sub.headers     |    6 -
 .../generic/generic-0_10_1.sub.html           |    8 +-
 .../generic-0_10_1.sub.html.sub.headers       |    6 -
 .../generic/generic-0_2.html                  |   10 +-
 .../generic/generic-0_2.html.sub.headers      |    6 -
 .../generic/generic-0_2_2.sub.html            |    8 +-
 .../generic-0_2_2.sub.html.sub.headers        |    6 -
 .../generic/generic-0_2_3.html                |    8 +-
 .../generic/generic-0_2_3.html.sub.headers    |    6 -
 .../generic/generic-0_8.html.sub.headers      |    6 -
 ...{generic-0_8.html => generic-0_8.sub.html} |   10 +-
 .../generic/generic-0_8_1.sub.html            |    7 +-
 .../generic-0_8_1.sub.html.sub.headers        |    6 -
 .../generic/generic-0_9.sub.html              |   12 +-
 .../generic/generic-0_9.sub.html.sub.headers  |    6 -
 .../policy-does-not-affect-child.sub.html     |   24 +
 .../generic/support/log-pass.html             |    3 +
 .../generic/support/sandboxed-eval.sub.html   |    4 +
 .../sandboxed-eval.sub.html.sub.headers       |    1 +
 .../img-src/icon-allowed.sub.html             |   28 +
 .../img-src/icon-blocked.sub.html             |   33 +
 .../report-blocked-data-uri.sub.html          |   13 +-
 .../media-src/media-src-7_1.html              |   10 +-
 .../media-src/media-src-7_1.html.sub.headers  |    6 -
 .../media-src/media-src-7_1_2.sub.html        |   13 +-
 .../media-src-7_1_2.sub.html.sub.headers      |    6 -
 .../media-src/media-src-7_2.html              |   10 +-
 .../media-src/media-src-7_2.html.sub.headers  |    6 -
 .../media-src/media-src-7_2_2.sub.html        |   13 +-
 .../media-src-7_2_2.sub.html.sub.headers      |    6 -
 .../media-src/media-src-7_3.sub.html          |   13 +-
 .../media-src-7_3.sub.html.sub.headers        |    6 -
 .../media-src/media-src-7_3_2.sub.html        |   17 +-
 .../media-src-7_3_2.sub.html.sub.headers      |    6 -
 .../media-src/media-src-blocked.sub.html      |   16 +-
 .../media-src-blocked.sub.html.sub.headers    |    6 -
 .../media-src/media-src-redir-bug.sub.html    |   11 +-
 .../media-src-redir-bug.sub.html.sub.headers  |    6 -
 .../combine-header-and-meta-policies.sub.html |    7 +-
 ...er-and-meta-policies.sub.html.sub.headers} |    2 +-
 .../meta-outside-head.sub.html                |   13 +-
 .../meta-outside-head.sub.html.sub.headers    |    1 +
 .../support}/metaHelper.js                    |    0
 .../object-src-no-url-allowed.sub.html        |   31 +
 .../object-src-no-url-blocked.sub.html        |   27 +
 .../object-src-url-allowed.sub.html}          |   22 +-
 .../object-src-url-blocked.sub.html           |   27 +
 .../plugintypes-mismatched-data.sub.html      |   17 +-
 .../plugintypes-mismatched-url.sub.html       |   17 +-
 .../plugintypes-notype-data.sub.html          |   13 +-
 .../plugintypes-notype-url.sub.html           |   14 +-
 .../plugintypes-nourl-allowed.sub.html        |   16 +-
 .../plugintypes-nourl-blocked.sub.html}       |   15 +-
 ...d-reports-without-violation.https.sub.html |   20 +
 ...thout-violation.https.sub.html.sub.headers |    7 +
 ...-sends-reports-on-violation.https.sub.html |   25 +
 ...ts-on-violation.https.sub.html.sub.headers |    7 +
 ...t-to-overrides-report-uri-1.https.sub.html |   25 +
 ...es-report-uri-1.https.sub.html.sub.headers |    7 +
 ...t-to-overrides-report-uri-2.https.sub.html |   25 +
 ...es-report-uri-2.https.sub.html.sub.headers |    7 +
 ...-sends-reports-on-violation.https.sub.html |   25 +
 ...ts-on-violation.https.sub.html.sub.headers |    7 +
 .../securitypolicyviolation-idl.html          |   49 +
 .../sandbox/iframe-inside-csp.sub.html        |   18 +
 .../sandbox-allow-scripts-subframe.sub.html   |   22 +
 .../sandbox/sandbox-allow-scripts.sub.html    |   22 +
 .../sandbox/sandbox-empty-subframe.sub.html   |   23 +
 .../sandbox/sandbox-empty.sub.html            |   25 +
 .../support/sandboxed-data-iframe.sub.html    |    1 +
 ...sandboxed-data-iframe.sub.html.sub.headers |    1 +
 .../sandbox/support/sandboxed-eval.sub.html   |    4 +
 .../sandboxed-eval.sub.html.sub.headers       |    1 +
 .../sandboxed-post-message-to-parent.sub.html |    3 +
 ...ost-message-to-parent.sub.html.sub.headers |    1 +
 .../script-src/10_1_support_1.js              |    5 +-
 .../script-src/10_1_support_2.js              |    4 +-
 .../addInlineTestsWithDOMManipulation.js      |   10 +
 .../injected-inline-script-allowed.sub.html   |   24 +
 .../injected-inline-script-blocked.sub.html   |   24 +
 .../script-src/inlineSuccessTest.js           |    4 +
 .../script-src/inlineTests.js                 |   11 +-
 .../javascript-window-open-blocked.html       |    4 +-
 .../script-src/script-src-1_1.html            |    4 +-
 .../script-src-1_1.html.sub.headers           |    6 -
 .../script-src/script-src-1_10.html           |    8 +-
 .../script-src-1_10.html.sub.headers          |    6 -
 .../script-src/script-src-1_10_1.html         |    3 +-
 .../script-src-1_10_1.html.sub.headers        |    6 -
 .../script-src/script-src-1_2.html            |    4 +-
 .../script-src-1_2.html.sub.headers           |    6 -
 .../script-src/script-src-1_2_1.html          |    4 +-
 .../script-src-1_2_1.html.sub.headers         |    6 -
 .../script-src/script-src-1_3.html            |    4 +-
 .../script-src-1_3.html.sub.headers           |    6 -
 .../script-src/script-src-1_4.html            |    9 +-
 .../script-src-1_4.html.sub.headers           |    6 -
 .../script-src/script-src-1_4_1.html          |   15 +-
 .../script-src-1_4_1.html.sub.headers         |    6 -
 .../script-src/script-src-1_4_2.html          |   10 +-
 .../script-src-1_4_2.html.sub.headers         |    6 -
 ...-policies-multiple-hashing-algorithms.html |    2 -
 ...ltiple-hashing-algorithms.html.sub.headers |    5 +-
 ...policies-one-using-hashing-algorithms.html |    2 -
 ...-using-hashing-algorithms.html.sub.headers |    5 +-
 .../script-src-overrides-default-src.sub.html |   27 +
 ...olicy-works-with-external-hash-policy.html |   10 +-
 ...with-external-hash-policy.html.sub.headers |    3 +-
 ...rt-only-policy-works-with-hash-policy.html |    2 -
 ...cy-works-with-hash-policy.html.sub.headers |    3 +-
 .../script-src-wildcards-disallowed.html      |    4 +-
 .../scripthash-allowed.sub.html               |   12 +-
 .../scripthash-basic-blocked.sub.html         |   11 +-
 .../scripthash-default-src.sub.html           |   20 +
 .../scripthash-ignore-unsafeinline.sub.html   |    7 +-
 .../scripthash-unicode-normalization.sub.html |   11 +-
 .../scriptnonce-allowed.sub.html              |    6 +-
 .../scriptnonce-and-scripthash.sub.html       |    9 +-
 .../scriptnonce-basic-blocked.sub.html        |   10 +-
 .../scriptnonce-ignore-unsafeinline.sub.html  |   10 +-
 .../scriptnonce-redirect.sub.html             |    5 +-
 .../srcdoc-doesnt-bypass-script-src.sub.html  |   35 +
 .../script-src/support/inject-script.js       |    5 +
 .../support}/post-message.js                  |    0
 .../support}/worker-eval.js                   |    0
 .../support}/worker-eval.js.sub.headers       |    0
 .../support}/worker-function-function.js      |    0
 .../worker-function-function.js.sub.headers   |    0
 .../support}/worker-importscripts.js          |    2 +-
 .../worker-importscripts.js.sub.headers       |    0
 .../support}/worker-set-timeout.js            |    0
 .../worker-set-timeout.js.sub.headers         |    0
 .../worker-eval-blocked.sub.html              |   19 +-
 .../worker-function-function-blocked.sub.html |   19 +-
 .../worker-importscripts-blocked.sub.html     |   12 +-
 .../script-src/worker-script-src.sub.html     |   32 +
 .../worker-set-timeout-blocked.sub.html       |   11 +-
 .../injected-inline-style-allowed.sub.html    |   17 +-
 .../injected-inline-style-blocked.sub.html    |   16 +-
 ...yle-allowed-while-cloning-objects.sub.html |   11 +-
 .../inline-style-allowed.sub.html             |   11 +-
 .../inline-style-attribute-allowed.sub.html   |   11 +-
 .../inline-style-attribute-blocked.sub.html   |   14 +-
 .../inline-style-attribute-on-html.sub.html   |   12 +-
 .../inline-style-blocked.sub.html             |   10 +-
 .../style-src/resources/allowed.css           |    3 +
 .../style-allowed.sub.html                    |   10 +-
 .../style-blocked.sub.html                    |   12 +-
 .../stylehash-allowed.sub.html                |    6 +-
 .../stylehash-basic-blocked.sub.html          |   13 +-
 .../stylehash-default-src.sub.html            |    7 +-
 .../stylenonce-allowed.sub.html               |   14 +-
 .../stylenonce-blocked.sub.html               |   14 +-
 .../support}/inject-style.js                  |    0
 .../support/checkReport.sub.js                |   15 +-
 .../document-write-alert-fail.js              |    0
 .../support/manifest.json                     |    5 +
 .../content-security-policy/svg/scripted.svg  |    2 +-
 .../svg/svg-from-guid.html                    |    2 +-
 .../svg/svg-inline.sub.html                   |   35 +-
 .../svg/svg-inline.sub.html.sub.headers       |    6 -
 .../eval-allowed.sub.html                     |   12 +-
 .../eval-blocked-and-sends-report.sub.html    |   11 +-
 ...val-blocked-in-about-blank-iframe.sub.html |   34 +
 .../eval-blocked.sub.html                     |   13 +-
 .../eval-scripts-setInterval-allowed.sub.html |   33 +
 .../eval-scripts-setInterval-blocked.sub.html |   31 +
 .../eval-scripts-setTimeout-allowed.sub.html  |   28 +
 .../eval-scripts-setTimeout-blocked.sub.html  |   30 +
 .../function-constructor-allowed.sub.html     |   26 +
 .../function-constructor-blocked.sub.html     |   13 +-
 .../css-flexbox-1/percentage-heights-000.html |    2 +-
 .../css-flexbox-1/percentage-heights-001.html |    2 +-
 .../css-flexbox-1/position-absolute-001.html  |    2 +-
 .../css-flexbox-1/position-absolute-002.html  |    2 +-
 .../css-flexbox-1/position-absolute-003.html  |    2 +-
 .../css-flexbox-1/position-absolute-004.html  |    2 +-
 .../css/css-fonts-3/font-stretch-01.html      |   31 +
 .../css/css-fonts-3/font-stretch-02.html      |   32 +
 .../css/css-fonts-3/font-stretch-03.html      |   32 +
 .../css/css-fonts-3/font-stretch-04.html      |   32 +
 .../css/css-fonts-3/font-stretch-05.html      |   32 +
 .../css/css-fonts-3/font-stretch-06.html      |   32 +
 .../css/css-fonts-3/font-stretch-07.html      |   32 +
 .../css/css-fonts-3/font-stretch-08.html      |   32 +
 .../css/css-fonts-3/font-stretch-09.html      |   32 +
 .../css/css-fonts-3/font-stretch-10.html      |   32 +
 .../css/css-fonts-3/font-stretch-11.html      |   32 +
 .../css/css-fonts-3/font-stretch-12.html      |   33 +
 .../css/css-fonts-3/font-stretch-13.html      |   32 +
 .../css/css-fonts-3/font-stretch-14.html      |   32 +
 .../css/css-fonts-3/font-stretch-15.html      |   32 +
 .../css/css-fonts-3/font-stretch-16.html      |   32 +
 .../css/css-fonts-3/font-stretch-17.html      |   32 +
 .../css/css-fonts-3/font-stretch-18.html      |   32 +
 .../css-fonts-3/font-stretch-pass-ref.html    |   22 +
 .../css-fonts-3/font-synthesis-01-ref.html    |   21 +
 .../css/css-fonts-3/font-synthesis-01.html    |   31 +
 .../css-fonts-3/font-synthesis-02-ref.html    |   21 +
 .../css/css-fonts-3/font-synthesis-02.html    |   31 +
 .../css-fonts-3/font-synthesis-03-ref.html    |   21 +
 .../css/css-fonts-3/font-synthesis-03.html    |   31 +
 .../css-fonts-3/font-synthesis-04-ref.html    |   21 +
 .../css/css-fonts-3/font-synthesis-04.html    |   31 +
 .../css-fonts-3/font-synthesis-05-ref.html    |   23 +
 .../css/css-fonts-3/font-synthesis-05.html    |   29 +
 .../css-fonts-3/font-variant-position-02.html |   18 +-
 .../css-fonts-3/font-variant-position-03.html |   18 +-
 .../support/fonts/Exo-DemiBold.otf            |  Bin 0 -> 110564 bytes
 .../support/fonts/Exo2-SemiBold.otf           |  Bin 0 -> 123976 bytes
 .../support/fonts/Exo2-SemiBoldCondensed.otf  |  Bin 0 -> 67940 bytes
 .../support/fonts/Exo2-SemiBoldExpanded.otf   |  Bin 0 -> 68772 bytes
 .../css/css-fonts-3/support/fonts/fail.woff   |  Bin 0 -> 2136 bytes
 .../css/css-fonts-3/support/fonts/pass.woff   |  Bin 0 -> 2112 bytes
 .../css-fonts-3/test_font_family_parsing.html |   23 +-
 .../test_font_feature_values_parsing.html     |    5 -
 ...solute-positioning-definite-sizes-001.html |    2 +-
 ...g-grid-container-containing-block-001.html |    2 +-
 ...positioning-grid-container-parent-001.html |    2 +-
 ...ositioned-items-content-alignment-001.html |    2 +-
 ...ioned-items-content-alignment-rtl-001.html |    2 +-
 .../grid-positioned-items-gaps-001.html       |    2 +-
 .../grid-positioned-items-gaps-rtl-001.html   |    2 +-
 ...id-positioned-items-implicit-grid-001.html |    2 +-
 ...sitioned-items-implicit-grid-line-001.html |    2 +-
 .../grid-positioned-items-padding-001.html    |    2 +-
 ...ned-items-unknown-named-grid-line-001.html |    2 +-
 ...-items-within-grid-implicit-track-001.html |    2 +-
 .../grid-sizing-positioned-items-001.html     |    2 +-
 ...should-not-create-implicit-tracks-001.html |    2 +-
 ...id-items-should-not-take-up-space-001.html |    2 +-
 ...rid-alignment-implies-size-change-001.html |    2 +-
 ...rid-alignment-implies-size-change-002.html |    2 +-
 ...rid-alignment-implies-size-change-003.html |    2 +-
 ...rid-alignment-implies-size-change-004.html |    2 +-
 ...rid-alignment-implies-size-change-005.html |    2 +-
 ...rid-alignment-implies-size-change-006.html |    2 +-
 ...rid-alignment-implies-size-change-007.html |    2 +-
 ...rid-alignment-implies-size-change-008.html |    2 +-
 ...rid-alignment-implies-size-change-009.html |    2 +-
 ...rid-alignment-implies-size-change-010.html |    2 +-
 ...rid-alignment-implies-size-change-011.html |    2 +-
 ...rid-alignment-implies-size-change-012.html |    2 +-
 ...rid-alignment-implies-size-change-013.html |    2 +-
 ...rid-alignment-implies-size-change-014.html |    2 +-
 ...rid-alignment-implies-size-change-015.html |    2 +-
 ...rid-alignment-implies-size-change-016.html |    2 +-
 ...rid-alignment-implies-size-change-017.html |    2 +-
 ...rid-alignment-implies-size-change-018.html |    2 +-
 ...rid-alignment-implies-size-change-019.html |    2 +-
 ...rid-alignment-implies-size-change-020.html |    2 +-
 ...rid-alignment-implies-size-change-021.html |    2 +-
 ...rid-alignment-implies-size-change-022.html |    2 +-
 ...rid-alignment-implies-size-change-023.html |    2 +-
 ...rid-alignment-implies-size-change-024.html |    2 +-
 ...rid-alignment-implies-size-change-025.html |    2 +-
 ...rid-alignment-implies-size-change-026.html |    2 +-
 ...rid-alignment-implies-size-change-027.html |    2 +-
 ...rid-alignment-implies-size-change-028.html |    2 +-
 ...rid-alignment-implies-size-change-029.html |    2 +-
 ...rid-alignment-implies-size-change-030.html |    2 +-
 ...rid-alignment-implies-size-change-031.html |    2 +-
 ...rid-alignment-implies-size-change-032.html |    2 +-
 ...rid-alignment-implies-size-change-033.html |    2 +-
 ...rid-alignment-implies-size-change-034.html |    2 +-
 ...rid-alignment-implies-size-change-035.html |    2 +-
 ...rid-alignment-implies-size-change-036.html |    2 +-
 ...d-fit-content-tracks-dont-stretch-001.html |    2 +-
 .../grid-self-alignment-stretch-001.html      |    2 +-
 .../grid-self-alignment-stretch-002.html      |    2 +-
 .../grid-self-alignment-stretch-003.html      |    2 +-
 .../grid-self-alignment-stretch-004.html      |    2 +-
 .../grid-self-alignment-stretch-005.html      |    2 +-
 .../grid-self-alignment-stretch-006.html      |    2 +-
 .../grid-self-alignment-stretch-007.html      |    2 +-
 .../grid-self-alignment-stretch-008.html      |    2 +-
 .../grid-self-alignment-stretch-009.html      |    2 +-
 .../grid-self-alignment-stretch-010.html      |    2 +-
 .../grid-self-alignment-stretch-011.html      |    2 +-
 .../grid-self-alignment-stretch-012.html      |    2 +-
 .../grid-self-alignment-stretch-013.html      |    2 +-
 .../grid-self-alignment-stretch-014.html      |    2 +-
 .../grid-self-alignment-stretch-015.html      |    2 +-
 .../grid-self-alignment-stretch-016.html      |    2 +-
 ...elf-alignment-stretch-vertical-lr-001.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-002.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-003.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-004.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-005.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-006.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-007.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-008.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-009.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-010.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-011.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-012.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-013.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-014.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-015.html |    2 +-
 ...elf-alignment-stretch-vertical-lr-016.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-001.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-002.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-003.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-004.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-005.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-006.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-007.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-008.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-009.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-010.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-011.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-012.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-013.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-014.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-015.html |    2 +-
 ...elf-alignment-stretch-vertical-rl-016.html |    2 +-
 .../grid-change-fit-content-argument-001.html |   72 +
 ...-template-columns-fit-content-001-ref.html |  351 +
 ...grid-template-columns-fit-content-001.html |  355 +
 ...rid-template-rows-fit-content-001-ref.html |  348 +
 .../grid-template-rows-fit-content-001.html   |  355 +
 .../grid-model/grid-box-sizing-001.html       |  188 +
 .../grid-stretch-respects-min-size-001.html   |   40 +
 .../css/css-grid-1/support/check-layout-th.js |  190 -
 .../gradients-with-transparent-ref.html       |   21 +
 .../gradients-with-transparent.html           |   26 +
 .../fixed-layout-calc-width-001.html          |    2 +-
 ...-layout-excess-width-distribution-001.html |    2 +-
 .../css-tables-3/support/check-layout-th.js   |  190 -
 .../css/css-ui-3/cursor-auto-004.html         |    2 +-
 .../css/css-ui-3/cursor-auto-005.html         |    6 +-
 .../css/css-ui-3/cursor-auto-006.html         |   46 +
 .../css/css-ui-3/cursor-auto-007.html         |   55 +
 .../css/css-ui-3/cursor-image-006.html        |    2 +-
 .../t44-currentcolor-inherited-c-ref.xht      |   15 +
 .../t44-currentcolor-inherited-c.xht          |    1 +
 ...interpolation-filters-parsing-invalid.html |   20 +
 ...r-interpolation-filters-parsing-valid.html |   26 +
 .../parsing/filter-parsing-invalid.html       |   65 +
 .../parsing/filter-parsing-valid.html         |   61 +
 .../lighting-color-parsing-invalid.html       |   20 +
 .../parsing/lighting-color-parsing-valid.html |   24 +
 .../parsing/resources/parsing-testcommon.js   |   37 +
 ...al.html => overscrollBehavior-manual.html} |   30 +-
 ...edia-default-feature-policy.https.sub.html |    2 +-
 .../fetch/api/basic/keepalive.html            |   31 +
 .../fetch/api/request/request-keepalive.html  |   28 +
 .../fetch/api/resources/keepalive-iframe.html |   17 +
 .../fetch/api/resources/redirect.py           |    4 +
 ...> SensorErrorEvent-constructor.https.html} |    0
 .../generic-sensor/generic-sensor-tests.js    |    6 +-
 .../gyroscope/Gyroscope_insecure_context.html |    2 +-
 .../gyroscope/idlharness.https.html           |    7 +-
 .../html/dom/elements-embedded.js             |    1 +
 .../focus/processing-model/preventScroll.html |   75 +
 .../support/preventScroll-helper.html         |    6 +
 .../query-encoding/resources/resolve-url.js   |    4 +-
 .../the-dialog-element/dialog-enabled.html    |   16 +
 .../dialog-return-value.html                  |   54 +
 .../show-modal-focusing-steps.html            |   63 +
 .../dynamic-import/dynamic-imports-error.html |   21 -
 .../dynamic-imports-fetch-error.sub.html      |   40 +
 .../dynamic-imports-script-error.html         |   53 +
 .../errorhandling-wrongMimetype-import.js     |    2 +-
 .../module/errorhandling.html                 |    2 +-
 .../import-meta/import-meta-dependent.js      |    1 +
 .../module/import-meta/import-meta-root.js    |    2 +
 .../module/import-meta/import-meta-url.html   |   23 +
 .../module/resources/404-but-js.asis          |    4 +
 .../module/resources/500-but-js.asis          |    4 +
 .../module/resources/imports-404-but-js.js    |    1 +
 .../module/resources/imports-500-but-js.js    |    1 +
 .../resources/imports-b-cross-origin.sub.js   |    1 +
 .../interfaces/ambient-light.idl              |    4 +
 .../interfaces/cssom-view.idl                 |    7 +-
 .../web-platform-tests/interfaces/html.idl    |  352 +-
 .../interfaces/wake-lock.idl                  |   23 +
 tests/wpt/web-platform-tests/lint.whitelist   |    4 +
 .../longtask-in-new-window.html               |   45 +
 .../resources/frame-with-longtask.html        |   14 +
 .../Magnetometer_insecure_context.html        |    2 +-
 .../magnetometer/idlharness.https.html        |   19 +-
 ...aStream-default-feature-policy.https.html} |    9 +-
 .../MediaStreamTrack-idl.https.html           |   52 +
 .../MediaStreamTrack-init.https.html          |   42 +-
 .../mediacapture-streams/OWNERS               |    2 +
 .../keep-scheme-redirect/allowed.https.html   |   40 -
 .../top-level/no-redirect/allowed.https.html  |   40 -
 .../keep-scheme-redirect/allowed.https.html   |   40 -
 .../top-level/no-redirect/allowed.https.html  |   40 -
 .../allowed.https.html.headers                |    1 -
 .../no-redirect/allowed.https.html.headers    |    1 -
 .../allowed.https.html.headers                |    1 -
 .../no-redirect/allowed.https.html.headers    |    1 -
 .../top-level/no-redirect/allowed.https.html  |   41 -
 .../top-level/no-redirect/allowed.https.html  |   41 -
 .../keep-scheme-redirect/allowed.https.html   |   40 -
 .../top-level/no-redirect/allowed.https.html  |   40 -
 .../keep-scheme-redirect/allowed.https.html   |   40 -
 .../top-level/no-redirect/allowed.https.html  |   40 -
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html                  |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../opt-in-blocks.https.html                  |   40 -
 .../no-redirect/opt-in-blocks.https.html      |   40 -
 .../opt-in-blocks.https.html                  |   40 -
 .../opt-in-blocks.https.html                  |   40 -
 .../no-redirect/opt-in-blocks.https.html      |   40 -
 .../opt-in-blocks.https.html                  |   40 -
 .../opt-in-blocks.https.html                  |   40 -
 .../no-redirect/opt-in-blocks.https.html      |   40 -
 .../opt-in-blocks.https.html                  |   40 -
 .../opt-in-blocks.https.html                  |   40 -
 .../no-redirect/opt-in-blocks.https.html      |   40 -
 .../opt-in-blocks.https.html                  |   40 -
 .../no-redirect/opt-in-blocks.https.html      |   41 -
 .../no-redirect/opt-in-blocks.https.html      |   41 -
 .../no-redirect/opt-in-blocks.https.html      |   41 -
 .../no-redirect/opt-in-blocks.https.html      |   41 -
 .../no-opt-in-blocks.https.html               |   40 -
 .../no-redirect/no-opt-in-blocks.https.html   |   40 -
 .../no-opt-in-blocks.https.html               |   40 -
 .../no-opt-in-blocks.https.html               |   40 -
 .../no-redirect/no-opt-in-blocks.https.html   |   40 -
 .../no-opt-in-blocks.https.html               |   40 -
 .../no-opt-in-blocks.https.html               |   40 -
 .../no-redirect/no-opt-in-blocks.https.html   |   40 -
 .../no-opt-in-blocks.https.html               |   40 -
 .../no-opt-in-blocks.https.html               |   40 -
 .../no-redirect/no-opt-in-blocks.https.html   |   40 -
 .../no-opt-in-blocks.https.html               |   40 -
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../mixed-content/generic/common.js           |   33 +-
 .../mixed-content/generic/expect.py           |    9 +-
 .../generic/mixed-content-test-case.js        |   29 +-
 .../mixed-content/generic/tools/clean.py      |    1 -
 .../generic/tools/common_paths.py             |    7 +-
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html                  |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html                  |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../opt-in-blocks.https.html.headers          |    1 -
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../mixed-content/spec.src.json               |    2 -
 .../mixed-content/spec_json.js                |    2 +-
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../opt-in-blocks.https.html                  |    0
 .../opt-in-blocks.https.html                  |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../no-opt-in-allows.https.html               |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../ws-downgrade-blocks.https.html.headers    |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../ws-downgrade-blocks.https.html.headers    |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../ws-downgrade-blocks.https.html.headers    |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../ws-downgrade-blocks.https.html.headers    |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../ws-downgrade-blocks.https.html.headers    |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../ws-downgrade-blocks.https.html.headers    |    0
 .../allowed}/websocket-allowed.https.html     |    0
 .../websocket-allowed.https.html.headers      |    0
 .../allowed}/websocket-allowed.https.html     |    0
 .../websocket-allowed.https.html.headers      |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../allowed}/websocket-allowed.https.html     |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../blockable}/ws-downgrade-blocks.https.html |    0
 .../allowed}/websocket-allowed.https.html     |    0
 .../allowed}/websocket-allowed.https.html     |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../opt-in-blocks.https.html.headers          |    0
 .../allowed}/allowed.https.html               |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../allowed}/allowed.https.html.headers       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../blockable}/opt-in-blocks.https.html       |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../blockable}/no-opt-in-blocks.https.html    |    0
 .../allowed}/allowed.https.html               |    0
 .../no-redirect/allowed}/allowed.https.html   |    0
 .../OrientationSensor_insecure_context.html   |    4 +-
 .../orientation-sensor/idlharness.https.html  |    1 +
 .../pointerevents/pointerevent_support.js     |    4 +-
 .../generic/iframe-inheritance.html           |   39 +
 ...f.html => callback-timeout-when-busy.html} |   30 +-
 .../requestidlecallback/idlharness.html       |   21 +-
 .../support => resources}/check-layout-th.js  |   13 +-
 .../resources/idlharness.js                   |   43 +-
 .../basic-dedicated-worker.html               |   40 +-
 .../basic-dedicated-worker.https.html         |   40 +-
 .../basic-popup-and-iframe-tests.https.js     |   41 +-
 .../shared-worker-secure-first.https.html     |   20 +-
 .../support/https-subframe-dedicated.html     |   38 +-
 .../support/parent-dedicated-worker-script.js |   11 +-
 .../support/parent-shared-worker-script.js    |   11 +-
 .../support/window-name-navigation.sub.html   |   11 -
 .../support/window-name-test.sub.html         |   23 -
 ...cross-origin-aux-frame-navigation.sub.html |   17 -
 ...ross-origin-main-frame-navigation.sub.html |   13 -
 ...cross-origin-sub-frame-navigation.sub.html |   18 -
 ...-same-origin-aux-frame-navigation.sub.html |   17 -
 ...same-origin-main-frame-navigation.sub.html |   13 -
 ...-same-origin-sub-frame-navigation.sub.html |   18 -
 .../service-worker/fetch-event.https.html     |   64 +
 .../request-body-blob.https.html              |   31 -
 .../resources/fetch-event-test-worker.js      |   16 +-
 .../resources/request-body-blob-iframe.html   |   20 -
 .../resources/request-body-blob-worker.js     |   11 -
 .../shadow-dom/event-post-dispatch.html       |    4 +-
 .../wpt/web-platform-tests/speech-api/OWNERS  |    1 +
 .../tools/ci/before_install.sh                |    2 +
 .../tools/ci/check_stability.py               |   66 +-
 .../tools/ci/ci_manifest.sh                   |   12 +
 tests/wpt/web-platform-tests/tools/ci/jobs.py |    9 +-
 .../tools/ci/tests/test_jobs.py               |   14 +-
 .../tools/gitignore/gitignore.py              |    2 +-
 .../wpt/web-platform-tests/tools/lint/lint.py |   10 +-
 .../tools/manifest/commands.json              |    3 +
 .../tools/manifest/download.py                |  130 +
 .../tools/manifest/update.py                  |   12 +-
 .../tools/runner/index.html                   |    5 +-
 .../web-platform-tests/tools/runner/runner.js |   52 +-
 .../web-platform-tests/tools/serve/serve.py   |    6 +-
 .../tools/webdriver/webdriver/transport.py    |    2 +-
 .../tools/wpt/commands.json                   |    3 +-
 tests/wpt/web-platform-tests/tools/wpt/run.py |    7 +-
 .../web-platform-tests/tools/wpt/testfiles.py |   10 +-
 .../tools/wpt/tests/test_wpt.py               |    1 -
 .../wpt/web-platform-tests/tools/wpt/utils.py |   10 +-
 tests/wpt/web-platform-tests/tools/wpt/wpt.py |    5 +-
 .../tools/wptrunner/wptrunner/testloader.py   |   22 +-
 .../tools/wptrunner/wptrunner/testrunner.py   |    1 +
 .../tools/wptrunner/wptrunner/update/state.py |    2 +
 .../wptrunner/wptrunner/wptcommandline.py     |    2 +
 .../tools/wptrunner/wptrunner/wptrunner.py    |    3 +-
 .../web-platform-tests/visual-viewport/OWNERS |    1 +
 ...wport-attribute-event-handlers-manual.html |    0
 ...t-dimensions-custom-scrollbars-manual.html |    0
 ...viewport-dimensions-scrollbars-manual.html |    0
 ...rt-no-resize-event-on-overflow-recalc.html |    0
 .../viewport-offset-manual.html               |    0
 .../viewport-page-manual.html                 |    0
 .../viewport-read-size-causes-layout.html     |    0
 ...ort-read-size-in-iframe-causes-layout.html |    0
 .../viewport-resize-event-manual.html         |    0
 ...resize-event-on-load-overflowing-page.html |    0
 .../viewport-scale-iframe-manual.html         |    0
 .../viewport-scale-manual.html                |    0
 .../viewport-scroll-event-manual.html         |    0
 .../viewport-scrollbars-cause-resize.html     |    0
 .../viewport-type.html                        |    0
 .../viewport-unscaled-scale-iframe.html       |    0
 .../viewport-unscaled-scale.html              |    0
 .../viewport-unscaled-scroll-iframe.html      |    0
 .../viewport-unscaled-scroll.html             |    0
 .../viewport-unscaled-size-iframe.html        |    0
 .../viewport-unscaled-size.html               |    0
 ...iewport-url-bar-changes-height-manual.html |    0
 .../viewport_support.js                       |    0
 .../alertdialog_modal_true-manual.html        |   20 -
 .../wai-aria/dialog_modal_true-manual.html    |   20 -
 tests/wpt/web-platform-tests/wake-lock/OWNERS |    3 +
 .../wake-lock/interfaces.https.html           |   34 +
 .../AnimationEffectTiming/iterationStart.html |    6 +-
 .../web-animations/resources/effect-tests.js  |   17 +-
 .../chrome/resources/audioparam-testing.js    |  554 +
 .../webaudio/chrome/resources/audit-util.js   |  195 +
 .../webaudio/chrome/resources/audit.js        | 1317 +++
 .../chrome/resources/start-stop-exceptions.js |   45 +
 .../constant-source-basic.html                |   85 +
 .../constant-source-onended.html              |   38 +
 .../constant-source-output.html               |  175 +
 .../webdriver/tests/conftest.py               |    5 +-
 .../tests/contexts/maximize_window.py         |    4 +-
 .../webdriver/tests/cookies/delete_cookie.py  |    4 +-
 .../element_retrieval/get_active_element.py   |    8 +-
 .../webdriver/tests/fullscreen_window.py      |    4 +-
 .../webdriver/tests/get_window_rect.py        |    4 +-
 .../interaction/send_keys_content_editable.py |    2 +-
 .../webdriver/tests/minimize_window.py        |    4 +-
 .../webdriver/tests/navigation/get_title.py   |    8 +-
 .../new_session/create_alwaysMatch.py         |    6 +-
 .../sessions/new_session/create_firstMatch.py |    6 +-
 .../sessions/new_session/default_values.py    |   30 +-
 .../new_session/invalid_capabilities.py       |   26 +-
 .../tests/sessions/new_session/merge.py       |   27 +-
 .../tests/sessions/new_session/response.py    |   20 +-
 .../sessions/new_session/support/__init__.py  |    1 +
 .../webdriver/tests/set_window_rect.py        |    5 +-
 .../tests/state/get_element_attribute.py      |    8 +-
 .../tests/state/get_element_property.py       |    8 +-
 .../tests/state/get_element_tag_name.py       |    8 +-
 .../tests/state/is_element_selected.py        |    8 +-
 .../webdriver/tests/support/fixtures.py       |   12 +-
 .../webmessaging/Channel_postMessage_Blob.htm |   45 +
 .../webmessaging/broadcastchannel/blobs.html  |    8 +-
 .../broadcastchannel/resources/worker.js      |    7 +-
 .../webrtc/RTCPeerConnection-helper.js        |   51 +
 ...Connection-setRemoteDescription-offer.html |  105 +-
 ...ion-setRemoteDescription-tracks.https.html |  222 +
 .../web-platform-tests/webrtc/getstats.html   |   10 +-
 ...{interfaces.html => interfaces.https.html} |    0
 .../web-platform-tests/websockets/README.md   |    2 +-
 .../worklets/animation-worklet-import.html    |    3 +-
 .../worklets/animation-worklet-referrer.html  |   15 +
 .../worklets/paint-worklet-import.html        |    3 +-
 .../worklets/paint-worklet-referrer.html      |   15 +
 .../worklets/resources/import-tests.js        |    6 +-
 .../worklets/resources/referrer-tests.js      |   96 +
 .../worklets/resources/referrer-window.html   |   35 +
 .../worklets/resources/referrer.py            |   30 +
 .../worklets/resources/worklet-test-utils.js  |    8 +
 1213 files changed, 18236 insertions(+), 11146 deletions(-)
 create mode 100644 tests/wpt/css-tests/tools/manifest/download.py
 create mode 100644 tests/wpt/metadata/fetch/api/basic/keepalive.html.ini
 create mode 100644 tests/wpt/metadata/fetch/api/request/request-keepalive.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html.ini
 delete mode 100644 tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/generic/iframe-inheritance.html.ini
 create mode 100644 tests/wpt/web-platform-tests/IndexedDB/idbcursor-request-source.html
 create mode 100644 tests/wpt/web-platform-tests/IndexedDB/idbindex-request-source.html
 create mode 100644 tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-request-source.html
 create mode 100644 tests/wpt/web-platform-tests/acid/README.md
 create mode 100644 tests/wpt/web-platform-tests/acid/acid2/404.html
 create mode 100755 tests/wpt/web-platform-tests/acid/acid2/reference.html
 create mode 100755 tests/wpt/web-platform-tests/acid/acid2/reference.png
 create mode 100644 tests/wpt/web-platform-tests/acid/acid2/reftest.html
 create mode 100755 tests/wpt/web-platform-tests/acid/acid2/test.html
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/empty.css
 create mode 100644 tests/wpt/web-platform-tests/acid/acid3/empty.css.headers
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/empty.html
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/empty.png
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/empty.txt
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/empty.xml
 create mode 100644 tests/wpt/web-platform-tests/acid/acid3/empty.xml.headers
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/favicon.ico
 create mode 100644 tests/wpt/web-platform-tests/acid/acid3/favicon.ico.headers
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/reference.png
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/reference.sub.html
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/support-a.png
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/support-b.png
 create mode 100644 tests/wpt/web-platform-tests/acid/acid3/support-b.png.headers
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/svg.xml
 create mode 100644 tests/wpt/web-platform-tests/acid/acid3/svg.xml.headers
 create mode 100644 tests/wpt/web-platform-tests/acid/acid3/test.html
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/xhtml.1
 create mode 100644 tests/wpt/web-platform-tests/acid/acid3/xhtml.1.headers
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/xhtml.2
 create mode 100644 tests/wpt/web-platform-tests/acid/acid3/xhtml.2.headers
 create mode 100755 tests/wpt/web-platform-tests/acid/acid3/xhtml.3
 create mode 100644 tests/wpt/web-platform-tests/acid/acid3/xhtml.3.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/allowed.css
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-allow.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-allow.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-deny.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-deny.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-default-src.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-match-blob.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-multiple-header-policies.html.asis
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/duplicate-directive.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/iframe-inside-csp.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/iframe-inside-csp.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/manifest-src-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/manifest-src-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-track-block.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-track-block.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-blocked-data-uri.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-javascript.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-javascript.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-fail.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-pass.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/blue.css
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/generate-csp-report.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/go-to-echo-report.js
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-image.js
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-script.js
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/postmessage-fail.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/postmessage-pass.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/script.js
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/set-cookie.js.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/simple-event-stream
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/simple-event-stream.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/track.vtt
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-eval-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-from-guid.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-script-src.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-script-src.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/xsl-blocked-expected.png
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/blink-contrib/xsl-unaffected-by-style-src-1-expected.png
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => blob}/blob-urls-do-not-match-self.sub.html (67%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => blob}/blob-urls-match-blob.sub.html (80%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => blob}/self-doesnt-match-blob.sub.html (68%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => blob}/star-doesnt-match-blob.sub.html (66%)
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-allowed.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html.sub.headers
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => connect-src}/connect-src-beacon-allowed.sub.html (74%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => connect-src}/connect-src-beacon-redirect-to-blocked.sub.html (57%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => connect-src}/connect-src-eventsource-allowed.sub.html (66%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => connect-src}/connect-src-eventsource-redirect-to-blocked.sub.html (65%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => connect-src}/connect-src-websocket-allowed.sub.html (72%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => connect-src}/connect-src-xmlhttprequest-allowed.sub.html (74%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => connect-src}/connect-src-xmlhttprequest-redirect-to-blocked.sub.html (82%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => connect-src/support}/shared-worker-make-xhr-allowed.sub.js (80%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => connect-src/support}/shared-worker-make-xhr-blocked.sub.js (80%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => connect-src/support}/shared-worker-make-xhr-blocked.sub.js.sub.headers (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => connect-src/support}/worker-make-xhr-blocked.sub.js (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => connect-src/support}/worker-make-xhr-blocked.sub.js.sub.headers (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => connect-src/support}/worker-make-xhr.sub.js (100%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-allowed.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => connect-src}/worker-connect-src-blocked.sub.html (59%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => connect-src}/worker-from-guid.sub.html (75%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => default-src}/default-src-inline-allowed.sub.html (65%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-blocked.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => form-action}/form-action-src-allowed.sub.html (78%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => form-action}/form-action-src-blocked.sub.html (70%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => form-action}/form-action-src-default-ignored.sub.html (76%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => form-action}/form-action-src-get-allowed.sub.html (73%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => form-action}/form-action-src-get-blocked.sub.html (67%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => form-action}/form-action-src-javascript-blocked.sub.html (67%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.sub.headers
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => form-action}/form-action-src-redirect-blocked.sub.html (70%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => frame-src}/frame-src-about-blank-allowed-by-default.sub.html (57%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => frame-src}/frame-src-about-blank-allowed-by-scheme.sub.html (50%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => frame-src}/frame-src-allowed.sub.html (82%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => frame-src}/frame-src-blocked.sub.html (78%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => frame-src}/frame-src-cross-origin-load.sub.html (74%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => generic}/duplicate-directive.sub.html (71%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => generic}/filesystem-urls-do-not-match-self.sub.html (80%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => generic}/filesystem-urls-match-filesystem.sub.html (86%)
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-img-src.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-script-src.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10_1.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_2.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_3.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.html.sub.headers
 rename tests/wpt/web-platform-tests/content-security-policy/generic/{generic-0_8.html => generic-0_8.sub.html} (66%)
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_9.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/policy-does-not-affect-child.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/support/log-pass.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/img-src/icon-allowed.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/img-src/icon-blocked.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => img-src}/report-blocked-data-uri.sub.html (55%)
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1_2.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2_2.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3_2.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-blocked.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => meta}/combine-header-and-meta-policies.sub.html (86%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/report-disallowed-from-meta.sub.html.sub.headers => meta/combine-header-and-meta-policies.sub.html.sub.headers} (56%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => meta}/meta-outside-head.sub.html (71%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html.sub.headers
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => meta/support}/metaHelper.js (100%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-allowed.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-blocked.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/connect-src-websocket-blocked.sub.html => object-src/object-src-url-allowed.sub.html} (51%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-blocked.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => plugin-types}/plugintypes-mismatched-data.sub.html (63%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => plugin-types}/plugintypes-mismatched-url.sub.html (64%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => plugin-types}/plugintypes-notype-data.sub.html (67%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => plugin-types}/plugintypes-notype-url.sub.html (60%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => plugin-types}/plugintypes-nourl-allowed.sub.html (56%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/object-src-no-url-blocked.sub.html => plugin-types/plugintypes-nourl-blocked.sub.html} (53%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/iframe-inside-csp.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty-subframe.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-allowed.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-blocked.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_1.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10_1.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2_1.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_3.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_1.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_2.html.sub.headers
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-overrides-default-src.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => script-src}/script-src-wildcards-disallowed.html (95%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => script-src}/scripthash-allowed.sub.html (67%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => script-src}/scripthash-basic-blocked.sub.html (83%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-default-src.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => script-src}/scripthash-ignore-unsafeinline.sub.html (80%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => script-src}/scripthash-unicode-normalization.sub.html (85%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => script-src}/scriptnonce-allowed.sub.html (88%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => script-src}/scriptnonce-and-scripthash.sub.html (84%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => script-src}/scriptnonce-basic-blocked.sub.html (70%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => script-src}/scriptnonce-ignore-unsafeinline.sub.html (80%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => script-src}/scriptnonce-redirect.sub.html (88%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/support/inject-script.js
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => script-src/support}/post-message.js (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => script-src/support}/worker-eval.js (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => script-src/support}/worker-eval.js.sub.headers (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => script-src/support}/worker-function-function.js (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => script-src/support}/worker-function-function.js.sub.headers (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => script-src/support}/worker-importscripts.js (54%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => script-src/support}/worker-importscripts.js.sub.headers (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => script-src/support}/worker-set-timeout.js (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => script-src/support}/worker-set-timeout.js.sub.headers (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => script-src}/worker-eval-blocked.sub.html (58%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => script-src}/worker-function-function-blocked.sub.html (56%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => script-src}/worker-importscripts-blocked.sub.html (70%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/script-src/worker-script-src.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => script-src}/worker-set-timeout-blocked.sub.html (67%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => style-src}/injected-inline-style-allowed.sub.html (63%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => style-src}/injected-inline-style-blocked.sub.html (56%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => style-src}/inline-style-allowed-while-cloning-objects.sub.html (92%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => style-src}/inline-style-allowed.sub.html (69%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => style-src}/inline-style-attribute-allowed.sub.html (67%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => style-src}/inline-style-attribute-blocked.sub.html (56%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => style-src}/inline-style-attribute-on-html.sub.html (79%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => style-src}/inline-style-blocked.sub.html (68%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/style-src/resources/allowed.css
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => style-src}/style-allowed.sub.html (68%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => style-src}/style-blocked.sub.html (56%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => style-src}/stylehash-allowed.sub.html (89%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => style-src}/stylehash-basic-blocked.sub.html (81%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => style-src}/stylehash-default-src.sub.html (56%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => style-src}/stylenonce-allowed.sub.html (74%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib-2 => style-src}/stylenonce-blocked.sub.html (65%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => style-src/support}/inject-style.js (100%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib/resources => support}/document-write-alert-fail.js (100%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/support/manifest.json
 delete mode 100644 tests/wpt/web-platform-tests/content-security-policy/svg/svg-inline.sub.html.sub.headers
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => unsafe-eval}/eval-allowed.sub.html (72%)
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => unsafe-eval}/eval-blocked-and-sends-report.sub.html (62%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => unsafe-eval}/eval-blocked.sub.html (69%)
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html
 create mode 100644 tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-allowed.sub.html
 rename tests/wpt/web-platform-tests/content-security-policy/{blink-contrib => unsafe-eval}/function-constructor-blocked.sub.html (63%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-01.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-02.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-03.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-04.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-05.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-06.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-07.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-08.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-09.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-10.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-11.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-12.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-13.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-14.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-15.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-16.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-17.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-18.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-pass-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-01-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-01.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-02-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-02.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-03-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-03.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-04-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-04.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-05-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-05.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo-DemiBold.otf
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo2-SemiBold.otf
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo2-SemiBoldCondensed.otf
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo2-SemiBoldExpanded.otf
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/fail.woff
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/pass.woff
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-change-fit-content-argument-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-columns-fit-content-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-columns-fit-content-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-rows-fit-content-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-rows-fit-content-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid-1/grid-model/grid-box-sizing-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid-1/layout-algorithm/grid-stretch-respects-min-size-001.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-grid-1/support/check-layout-th.js
 create mode 100644 tests/wpt/web-platform-tests/css/css-images-3/gradients-with-transparent-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images-3/gradients-with-transparent.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-tables-3/support/check-layout-th.js
 create mode 100644 tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-006.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-007.html
 create mode 100644 tests/wpt/web-platform-tests/css/css3-color/t44-currentcolor-inherited-c-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/filter-effects-1/parsing/color-interpolation-filters-parsing-invalid.html
 create mode 100644 tests/wpt/web-platform-tests/css/filter-effects-1/parsing/color-interpolation-filters-parsing-valid.html
 create mode 100644 tests/wpt/web-platform-tests/css/filter-effects-1/parsing/filter-parsing-invalid.html
 create mode 100644 tests/wpt/web-platform-tests/css/filter-effects-1/parsing/filter-parsing-valid.html
 create mode 100644 tests/wpt/web-platform-tests/css/filter-effects-1/parsing/lighting-color-parsing-invalid.html
 create mode 100644 tests/wpt/web-platform-tests/css/filter-effects-1/parsing/lighting-color-parsing-valid.html
 create mode 100644 tests/wpt/web-platform-tests/css/filter-effects-1/parsing/resources/parsing-testcommon.js
 rename tests/wpt/web-platform-tests/cssom-view/{scrollBoundaryBehavior-manual.html => overscrollBehavior-manual.html} (79%)
 create mode 100644 tests/wpt/web-platform-tests/fetch/api/basic/keepalive.html
 create mode 100644 tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.html
 create mode 100644 tests/wpt/web-platform-tests/fetch/api/resources/keepalive-iframe.html
 rename tests/wpt/web-platform-tests/generic-sensor/{SensorErrorEvent-constructor.html => SensorErrorEvent-constructor.https.html} (100%)
 create mode 100644 tests/wpt/web-platform-tests/html/editing/focus/processing-model/preventScroll.html
 create mode 100644 tests/wpt/web-platform-tests/html/editing/focus/processing-model/support/preventScroll-helper.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html
 delete mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-dependent.js
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-root.js
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/500-but-js.asis
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-404-but-js.js
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-500-but-js.js
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-b-cross-origin.sub.js
 create mode 100644 tests/wpt/web-platform-tests/interfaces/ambient-light.idl
 create mode 100644 tests/wpt/web-platform-tests/interfaces/wake-lock.idl
 create mode 100644 tests/wpt/web-platform-tests/longtask-timing/shared-renderer/longtask-in-new-window.html
 create mode 100644 tests/wpt/web-platform-tests/longtask-timing/shared-renderer/resources/frame-with-longtask.html
 rename tests/wpt/web-platform-tests/mediacapture-streams/{MediaStream-default-feature-policy.https.sub.html => MediaStream-default-feature-policy.https.html} (90%)
 create mode 100644 tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-idl.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect => audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect => audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect => audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect => audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect => audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect => audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect => audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect => audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect => audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect => audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect => audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect => audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect => audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect => audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect => audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect => audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect => audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect => audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect => audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect => audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect => audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect => audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect => audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect => audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect => audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect => audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect => audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect => fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect => fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect => fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect => fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect => fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect => fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect => fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect => fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect => fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect => fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect => fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect => fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect => fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect => fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect => fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect => fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect => fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect => fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/fetch-request/top-level/no-redirect => fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect => fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/fetch-request/top-level/no-redirect => fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/fetch-request/top-level/swap-scheme-redirect => fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect => fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/fetch-request/top-level/no-redirect => fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/fetch-request/top-level/swap-scheme-redirect => fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/fetch-request/top-level/keep-scheme-redirect => fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/fetch-request/top-level/no-redirect => fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect => img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect => img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect => img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect => img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect => img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect => img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect => img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect => img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect => img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect => img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect => img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect => img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect => img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect => img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/img-tag/top-level/no-redirect => img-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/form-tag/top-level/no-redirect => img-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect => img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect => img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect => img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect => img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect => img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect => img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect => img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect => img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect => img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect => img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect => img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect => link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect => link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect => link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect => link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect => link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect => link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect => link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect => link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect => link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect => link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect => link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect => link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect => link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect => link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect => link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect => link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect => link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect => link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/link-css-tag/top-level/no-redirect => link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect => link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect => link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect => link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect => link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect => link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect => link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/link-css-tag/top-level/keep-scheme-redirect => link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/link-css-tag/top-level/no-redirect => link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect => link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect => link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect => link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect => link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect => link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect => link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect => link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect => link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect => link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect => link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect => link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect => link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect => link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect => link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect => link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/img-tag/top-level/no-redirect => link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect => link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect => link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect => link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect => link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect => link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect => link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect => link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect => link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect => link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect => link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect => link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect => object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect => object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect => object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/form-tag/top-level/no-redirect => object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect => object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect => object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect => object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect => object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/object-tag/top-level/no-redirect => object-tag/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect => object-tag/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect => object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect => object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect => object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect => object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/object-tag/top-level/no-redirect => object-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect => object-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect => object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect => object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/object-tag/top-level/no-redirect => object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect => object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect => object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect => object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect => object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect => object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect => object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/object-tag/top-level/keep-scheme-redirect => object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/object-tag/top-level/no-redirect => object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect => picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect => picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect => picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect => picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect => picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect => picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect => picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect => picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect => picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/object-tag/top-level/no-redirect => picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect => picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect => picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect => picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect => picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect => picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect => picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect => picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect => picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect => picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/picture-tag/top-level/keep-scheme-redirect => picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect => picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/picture-tag/top-level/swap-scheme-redirect => picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/picture-tag/top-level/keep-scheme-redirect => picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect => picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/picture-tag/top-level/swap-scheme-redirect => picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect => picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect => picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect => script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect => script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect => script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect => script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect => script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect => script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect => script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect => script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/script-tag/top-level/no-redirect => script-tag/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/script-tag/top-level/no-redirect => script-tag/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect => script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect => script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect => script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect => script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/script-tag/top-level/no-redirect => script-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/object-tag/top-level/no-redirect => script-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/cross-origin-http/script-tag/top-level/no-redirect => script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/same-host-http/script-tag/top-level/no-redirect => script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/script-tag/top-level/no-redirect => script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/script-tag/top-level/keep-scheme-redirect => script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/script-tag/top-level/no-redirect => script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/script-tag/top-level/swap-scheme-redirect => script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/script-tag/top-level/keep-scheme-redirect => script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/script-tag/top-level/no-redirect => script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/script-tag/top-level/swap-scheme-redirect => script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/script-tag/top-level/keep-scheme-redirect => script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/script-tag/top-level/no-redirect => script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect => video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect => video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect => video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/worker-request/top-level/no-redirect => video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect => video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect => video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect => video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect => video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect => video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect => video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect => video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect => video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect => video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect => video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/video-tag/top-level/no-redirect => video-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect => video-tag/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect => video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect => video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect => video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect => video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect => video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect => video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect => video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect => video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect => video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable}/no-opt-in-allows.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect => video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect => video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect => websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect => websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable}/ws-downgrade-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect => websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect => websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable}/ws-downgrade-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect => websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect => websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable}/ws-downgrade-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect => websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect => websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable}/ws-downgrade-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect => websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect => websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable}/ws-downgrade-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect => websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect => websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable}/ws-downgrade-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect => websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed}/websocket-allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect => websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed}/websocket-allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect => websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed}/websocket-allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect => websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed}/websocket-allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect => websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect => websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect => websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed}/websocket-allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect => websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect => websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect => websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect => websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect => websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect => websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable}/ws-downgrade-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect => websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed}/websocket-allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect => websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed}/websocket-allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect => worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect => worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect => worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect => worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect => worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect => worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect => worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect => worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/worker-request/top-level/no-redirect => worker-request/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect => worker-request/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect => worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect => worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect => worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect => worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/worker-request/top-level/no-redirect => worker-request/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/script-tag/top-level/no-redirect => worker-request/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/cross-origin-http/worker-request/top-level/no-redirect => worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/same-host-http/worker-request/top-level/no-redirect => worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/worker-request/top-level/no-redirect => worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/worker-request/top-level/keep-scheme-redirect => worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/worker-request/top-level/no-redirect => worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/worker-request/top-level/swap-scheme-redirect => worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/worker-request/top-level/keep-scheme-redirect => worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/worker-request/top-level/no-redirect => worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/worker-request/top-level/swap-scheme-redirect => worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/worker-request/top-level/keep-scheme-redirect => worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/worker-request/top-level/no-redirect => worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect => xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect => xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect => xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect => xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect => xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect => xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect => xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect => xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect => xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect => xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect => xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect => xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable}/opt-in-blocks.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect => xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect => xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect => xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/http-csp/same-host-https/video-tag/top-level/no-redirect => xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html.headers (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect => xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect => xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable}/opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect => xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/xhr-request/top-level/keep-scheme-redirect => xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/xhr-request/top-level/no-redirect => xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect => xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/xhr-request/top-level/keep-scheme-redirect => xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/xhr-request/top-level/no-redirect => xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect => xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable}/no-opt-in-blocks.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/xhr-request/top-level/keep-scheme-redirect => xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed}/allowed.https.html (100%)
 rename tests/wpt/web-platform-tests/mixed-content/{allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect => xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed}/allowed.https.html (100%)
 create mode 100644 tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html
 rename tests/wpt/web-platform-tests/requestidlecallback/{callback-timeout-with-raf.html => callback-timeout-when-busy.html} (68%)
 rename tests/wpt/web-platform-tests/{css/css-flexbox-1/support => resources}/check-layout-th.js (95%)
 delete mode 100644 tests/wpt/web-platform-tests/security/support/window-name-navigation.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/security/support/window-name-test.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/security/window-name-after-cross-origin-aux-frame-navigation.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/security/window-name-after-cross-origin-main-frame-navigation.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/security/window-name-after-cross-origin-sub-frame-navigation.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/security/window-name-after-same-origin-aux-frame-navigation.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/security/window-name-after-same-origin-main-frame-navigation.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/security/window-name-after-same-origin-sub-frame-navigation.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/service-workers/service-worker/request-body-blob.https.html
 delete mode 100644 tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-body-blob-iframe.html
 delete mode 100644 tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-body-blob-worker.js
 create mode 100644 tests/wpt/web-platform-tests/tools/ci/ci_manifest.sh
 create mode 100644 tests/wpt/web-platform-tests/tools/manifest/download.py
 create mode 100644 tests/wpt/web-platform-tests/visual-viewport/OWNERS
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-attribute-event-handlers-manual.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-dimensions-custom-scrollbars-manual.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-dimensions-scrollbars-manual.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-no-resize-event-on-overflow-recalc.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-offset-manual.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-page-manual.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-read-size-causes-layout.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-read-size-in-iframe-causes-layout.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-resize-event-manual.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-resize-event-on-load-overflowing-page.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-scale-iframe-manual.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-scale-manual.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-scroll-event-manual.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-scrollbars-cause-resize.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-type.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-unscaled-scale-iframe.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-unscaled-scale.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-unscaled-scroll-iframe.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-unscaled-scroll.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-unscaled-size-iframe.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-unscaled-size.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport-url-bar-changes-height-manual.html (100%)
 rename tests/wpt/web-platform-tests/{viewport => visual-viewport}/viewport_support.js (100%)
 create mode 100644 tests/wpt/web-platform-tests/wake-lock/OWNERS
 create mode 100644 tests/wpt/web-platform-tests/wake-lock/interfaces.https.html
 create mode 100644 tests/wpt/web-platform-tests/webaudio/chrome/resources/audioparam-testing.js
 create mode 100644 tests/wpt/web-platform-tests/webaudio/chrome/resources/audit-util.js
 create mode 100644 tests/wpt/web-platform-tests/webaudio/chrome/resources/audit.js
 create mode 100644 tests/wpt/web-platform-tests/webaudio/chrome/resources/start-stop-exceptions.js
 create mode 100644 tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-basic.html
 create mode 100644 tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-onended.html
 create mode 100644 tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-output.html
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/__init__.py
 create mode 100644 tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_Blob.htm
 create mode 100644 tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html
 rename tests/wpt/web-platform-tests/webrtc/{interfaces.html => interfaces.https.html} (100%)
 create mode 100644 tests/wpt/web-platform-tests/worklets/animation-worklet-referrer.html
 create mode 100644 tests/wpt/web-platform-tests/worklets/paint-worklet-referrer.html
 create mode 100644 tests/wpt/web-platform-tests/worklets/resources/referrer-tests.js
 create mode 100644 tests/wpt/web-platform-tests/worklets/resources/referrer-window.html
 create mode 100644 tests/wpt/web-platform-tests/worklets/resources/referrer.py
 create mode 100644 tests/wpt/web-platform-tests/worklets/resources/worklet-test-utils.js

diff --git a/tests/wpt/css-tests/tools/manifest/download.py b/tests/wpt/css-tests/tools/manifest/download.py
new file mode 100644
index 0000000000000..42998a2a2dba7
--- /dev/null
+++ b/tests/wpt/css-tests/tools/manifest/download.py
@@ -0,0 +1,130 @@
+import argparse
+import gzip
+import json
+import io
+import log
+import os
+from datetime import datetime, timedelta
+
+import urllib2
+
+from vcs import Git
+
+here = os.path.dirname(__file__)
+
+wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
+logger = log.get_logger()
+
+
+def abs_path(path):
+    return os.path.abspath(os.path.expanduser(path))
+
+
+def should_download(manifest_path, rebuild_time=timedelta(days=5)):
+    if not os.path.exists(manifest_path):
+        return True
+    mtime = datetime.fromtimestamp(os.path.getmtime(manifest_path))
+    if mtime < datetime.now() - rebuild_time:
+        return True
+    logger.info("Skipping manifest download because existing file is recent")
+    return False
+
+
+def git_commits(repo_root):
+    git = Git.get_func(repo_root)
+    return [item for item in git("log", "--format=%H", "-n50").split("\n") if item]
+
+
+def github_url(commits):
+    try:
+        resp = urllib2.urlopen("https://api.github.com/repos/w3c/web-platform-tests/releases")
+    except Exception:
+        return None
+
+    if resp.code != 200:
+        return None
+
+    try:
+        releases = json.load(resp.fp)
+    except ValueError:
+        logger.warning("Response was not valid JSON")
+        return None
+
+    fallback = None
+    for release in releases:
+        for commit in commits:
+            for item in release["assets"]:
+                if item["name"] == "MANIFEST-%s.json.gz" % commit:
+                    return item["browser_download_url"]
+                elif item["name"] == "MANIFEST.json.gz" and not fallback:
+                    fallback = item["browser_download_url"]
+    if fallback:
+        logger.info("Can't find a commit-specific manifest so just using the most recent one")
+        return fallback
+
+
+def download_manifest(manifest_path, commits_func, url_func, force=False):
+    if not force and not should_download(manifest_path):
+        return False
+
+    commits = commits_func()
+
+    url = url_func(commits)
+    if not url:
+        logger.warning("No generated manifest found")
+        return False
+
+    logger.info("Downloading manifest from %s" % url)
+    try:
+        resp = urllib2.urlopen(url)
+    except Exception:
+        logger.warning("Downloading pregenerated manifest failed")
+        return False
+
+    if resp.code != 200:
+        logger.warning("Downloading pregenerated manifest failed; got HTTP status %d" %
+                       resp.code)
+        return False
+
+    gzf = gzip.GzipFile(fileobj=io.BytesIO(resp.read()))
+
+    try:
+        decompressed = gzf.read()
+    except IOError:
+        logger.warning("Failed to decompress downloaded file")
+        return False
+
+    try:
+        with open(manifest_path, "w") as f:
+            f.write(decompressed)
+    except Exception:
+        logger.warning("Failed to write manifest")
+        return False
+    logger.info("Manifest downloaded")
+    return True
+
+
+def create_parser():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-p", "--path", type=abs_path, help="Path to manifest file.")
+    parser.add_argument(
+        "--tests-root", type=abs_path, default=wpt_root, help="Path to root of tests.")
+    parser.add_argument(
+        "--force", action="store_true",
+        help="Always download, even if the existing manifest is recent")
+    return parser
+
+
+def download_from_github(path, tests_root, force=False):
+    return download_manifest(path, lambda: git_commits(tests_root), github_url,
+                             force=force)
+
+
+def run(**kwargs):
+    if kwargs["path"] is None:
+        path = os.path.join(kwargs["tests_root"], "MANIFEST.json")
+    else:
+        path = kwargs["path"]
+    success = download_from_github(path, kwargs["tests_root"], kwargs["force"])
+    return 0 if success else 1
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index d602cc4d2ba9d..be71e38d09c08 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -10075,6 +10075,18 @@
      {}
     ]
    ],
+   "css/css-ui-3/cursor-auto-006.html": [
+    [
+     "/css/css-ui-3/cursor-auto-006.html",
+     {}
+    ]
+   ],
+   "css/css-ui-3/cursor-auto-007.html": [
+    [
+     "/css/css-ui-3/cursor-auto-007.html",
+     {}
+    ]
+   ],
    "css/css-ui-3/cursor-border-area.html": [
     [
      "/css/css-ui-3/cursor-border-area.html",
@@ -11599,9 +11611,9 @@
      {}
     ]
    ],
-   "cssom-view/scrollBoundaryBehavior-manual.html": [
+   "cssom-view/overscrollBehavior-manual.html": [
     [
-     "/cssom-view/scrollBoundaryBehavior-manual.html",
+     "/cssom-view/overscrollBehavior-manual.html",
      {}
     ]
    ],
@@ -17827,63 +17839,63 @@
      {}
     ]
    ],
-   "viewport/viewport-attribute-event-handlers-manual.html": [
+   "visual-viewport/viewport-attribute-event-handlers-manual.html": [
     [
-     "/viewport/viewport-attribute-event-handlers-manual.html",
+     "/visual-viewport/viewport-attribute-event-handlers-manual.html",
      {}
     ]
    ],
-   "viewport/viewport-dimensions-custom-scrollbars-manual.html": [
+   "visual-viewport/viewport-dimensions-custom-scrollbars-manual.html": [
     [
-     "/viewport/viewport-dimensions-custom-scrollbars-manual.html",
+     "/visual-viewport/viewport-dimensions-custom-scrollbars-manual.html",
      {}
     ]
    ],
-   "viewport/viewport-dimensions-scrollbars-manual.html": [
+   "visual-viewport/viewport-dimensions-scrollbars-manual.html": [
     [
-     "/viewport/viewport-dimensions-scrollbars-manual.html",
+     "/visual-viewport/viewport-dimensions-scrollbars-manual.html",
      {}
     ]
    ],
-   "viewport/viewport-offset-manual.html": [
+   "visual-viewport/viewport-offset-manual.html": [
     [
-     "/viewport/viewport-offset-manual.html",
+     "/visual-viewport/viewport-offset-manual.html",
      {}
     ]
    ],
-   "viewport/viewport-page-manual.html": [
+   "visual-viewport/viewport-page-manual.html": [
     [
-     "/viewport/viewport-page-manual.html",
+     "/visual-viewport/viewport-page-manual.html",
      {}
     ]
    ],
-   "viewport/viewport-resize-event-manual.html": [
+   "visual-viewport/viewport-resize-event-manual.html": [
     [
-     "/viewport/viewport-resize-event-manual.html",
+     "/visual-viewport/viewport-resize-event-manual.html",
      {}
     ]
    ],
-   "viewport/viewport-scale-iframe-manual.html": [
+   "visual-viewport/viewport-scale-iframe-manual.html": [
     [
-     "/viewport/viewport-scale-iframe-manual.html",
+     "/visual-viewport/viewport-scale-iframe-manual.html",
      {}
     ]
    ],
-   "viewport/viewport-scale-manual.html": [
+   "visual-viewport/viewport-scale-manual.html": [
     [
-     "/viewport/viewport-scale-manual.html",
+     "/visual-viewport/viewport-scale-manual.html",
      {}
     ]
    ],
-   "viewport/viewport-scroll-event-manual.html": [
+   "visual-viewport/viewport-scroll-event-manual.html": [
     [
-     "/viewport/viewport-scroll-event-manual.html",
+     "/visual-viewport/viewport-scroll-event-manual.html",
      {}
     ]
    ],
-   "viewport/viewport-url-bar-changes-height-manual.html": [
+   "visual-viewport/viewport-url-bar-changes-height-manual.html": [
     [
-     "/viewport/viewport-url-bar-changes-height-manual.html",
+     "/visual-viewport/viewport-url-bar-changes-height-manual.html",
      {}
     ]
    ],
@@ -19545,6 +19557,30 @@
      {}
     ]
    ],
+   "acid/acid2/reftest.html": [
+    [
+     "/acid/acid2/reftest.html",
+     [
+      [
+       "/acid/acid2/reference.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "acid/acid3/test.html": [
+    [
+     "/acid/acid3/test.html",
+     [
+      [
+       "/acid/acid3/reference.sub.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "apng/animated-png-timeout.html": [
     [
      "/apng/animated-png-timeout.html",
@@ -108861,6 +108897,282 @@
      {}
     ]
    ],
+   "css/css-fonts-3/font-stretch-01.html": [
+    [
+     "/css/css-fonts-3/font-stretch-01.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-02.html": [
+    [
+     "/css/css-fonts-3/font-stretch-02.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-03.html": [
+    [
+     "/css/css-fonts-3/font-stretch-03.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-04.html": [
+    [
+     "/css/css-fonts-3/font-stretch-04.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-05.html": [
+    [
+     "/css/css-fonts-3/font-stretch-05.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-06.html": [
+    [
+     "/css/css-fonts-3/font-stretch-06.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-07.html": [
+    [
+     "/css/css-fonts-3/font-stretch-07.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-08.html": [
+    [
+     "/css/css-fonts-3/font-stretch-08.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-09.html": [
+    [
+     "/css/css-fonts-3/font-stretch-09.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-10.html": [
+    [
+     "/css/css-fonts-3/font-stretch-10.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-11.html": [
+    [
+     "/css/css-fonts-3/font-stretch-11.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-12.html": [
+    [
+     "/css/css-fonts-3/font-stretch-12.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-13.html": [
+    [
+     "/css/css-fonts-3/font-stretch-13.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-14.html": [
+    [
+     "/css/css-fonts-3/font-stretch-14.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-15.html": [
+    [
+     "/css/css-fonts-3/font-stretch-15.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-16.html": [
+    [
+     "/css/css-fonts-3/font-stretch-16.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-17.html": [
+    [
+     "/css/css-fonts-3/font-stretch-17.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-stretch-18.html": [
+    [
+     "/css/css-fonts-3/font-stretch-18.html",
+     [
+      [
+       "/css/css-fonts-3/font-stretch-pass-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-synthesis-01.html": [
+    [
+     "/css/css-fonts-3/font-synthesis-01.html",
+     [
+      [
+       "/css/css-fonts-3/font-synthesis-01-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-synthesis-02.html": [
+    [
+     "/css/css-fonts-3/font-synthesis-02.html",
+     [
+      [
+       "/css/css-fonts-3/font-synthesis-02-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-synthesis-03.html": [
+    [
+     "/css/css-fonts-3/font-synthesis-03.html",
+     [
+      [
+       "/css/css-fonts-3/font-synthesis-03-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-synthesis-04.html": [
+    [
+     "/css/css-fonts-3/font-synthesis-04.html",
+     [
+      [
+       "/css/css-fonts-3/font-synthesis-04-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-synthesis-05.html": [
+    [
+     "/css/css-fonts-3/font-synthesis-05.html",
+     [
+      [
+       "/css/css-fonts-3/font-synthesis-03-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-fonts-3/font-variant-01.html": [
     [
      "/css/css-fonts-3/font-variant-01.html",
@@ -109629,30 +109941,6 @@
      {}
     ]
    ],
-   "css/css-fonts-3/font-variant-position-02.html": [
-    [
-     "/css/css-fonts-3/font-variant-position-02.html",
-     [
-      [
-       "/css/css-fonts-3/font-variant-position-02-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-fonts-3/font-variant-position-03.html": [
-    [
-     "/css/css-fonts-3/font-variant-position-03.html",
-     [
-      [
-       "/css/css-fonts-3/font-variant-position-03-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-fonts-3/font-variant-position.html": [
     [
      "/css/css-fonts-3/font-variant-position.html",
@@ -110961,6 +111249,30 @@
      {}
     ]
    ],
+   "css/css-grid-1/grid-definition/grid-template-columns-fit-content-001.html": [
+    [
+     "/css/css-grid-1/grid-definition/grid-template-columns-fit-content-001.html",
+     [
+      [
+       "/css/css-grid-1/grid-definition/grid-template-columns-fit-content-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-grid-1/grid-definition/grid-template-rows-fit-content-001.html": [
+    [
+     "/css/css-grid-1/grid-definition/grid-template-rows-fit-content-001.html",
+     [
+      [
+       "/css/css-grid-1/grid-definition/grid-template-rows-fit-content-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-grid-1/grid-items/grid-inline-items-001.html": [
     [
      "/css/css-grid-1/grid-items/grid-inline-items-001.html",
@@ -112245,6 +112557,18 @@
      {}
     ]
    ],
+   "css/css-grid-1/layout-algorithm/grid-stretch-respects-min-size-001.html": [
+    [
+     "/css/css-grid-1/layout-algorithm/grid-stretch-respects-min-size-001.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-grid-1/placement/grid-layout-grid-span.html": [
     [
      "/css/css-grid-1/placement/grid-layout-grid-span.html",
@@ -112401,6 +112725,18 @@
      {}
     ]
    ],
+   "css/css-images-3/gradients-with-transparent.html": [
+    [
+     "/css/css-images-3/gradients-with-transparent.html",
+     [
+      [
+       "/css/css-images-3/gradients-with-transparent-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-images-3/linear-gradient-1.html": [
     [
      "/css/css-images-3/linear-gradient-1.html",
@@ -154213,6 +154549,18 @@
      {}
     ]
    ],
+   "css/css3-color/t44-currentcolor-inherited-c.xht": [
+    [
+     "/css/css3-color/t44-currentcolor-inherited-c.xht",
+     [
+      [
+       "/css/css3-color/t44-currentcolor-inherited-c-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css3-selectors/root-siblings.htm": [
     [
      "/css/css3-selectors/root-siblings.htm",
@@ -179841,6 +180189,141 @@
      {}
     ]
    ],
+   "acid/README.md": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid2/404.html": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid2/reference.html": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid2/reference.png": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid2/test.html": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/empty.css": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/empty.css.headers": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/empty.html": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/empty.png": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/empty.txt": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/empty.xml": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/empty.xml.headers": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/favicon.ico": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/favicon.ico.headers": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/reference.png": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/reference.sub.html": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/support-a.png": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/support-b.png": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/support-b.png.headers": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/svg.xml": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/svg.xml.headers": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/xhtml.1": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/xhtml.1.headers": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/xhtml.2": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/xhtml.2.headers": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/xhtml.3": [
+    [
+     {}
+    ]
+   ],
+   "acid/acid3/xhtml.3.headers": [
+    [
+     {}
+    ]
+   ],
    "ambient-light/OWNERS": [
     [
      {}
@@ -204696,1372 +205179,517 @@
      {}
     ]
    ],
-   "content-security-policy/blink-contrib-2/allowed.css": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/base-uri-allow.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/base-uri-deny.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html.sub.headers": [
+   "content-security-policy/connect-src/resources/simple-event-stream": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html.sub.headers": [
+   "content-security-policy/connect-src/resources/simple-event-stream.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html.sub.headers": [
+   "content-security-policy/connect-src/support/shared-worker-make-xhr-allowed.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html.sub.headers": [
+   "content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html.sub.headers": [
+   "content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib-2/meta-outside-head.sub.html.sub.headers": [
+   "content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib-2/metaHelper.js": [
+   "content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html.sub.headers": [
+   "content-security-policy/connect-src/support/worker-make-xhr.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scripthash-default-src.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/stylehash-default-src.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/blob-urls-match-blob.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/combine-multiple-header-policies.html.asis": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/default-src-inline-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/default-src-inline-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/duplicate-directive.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/frame-src-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/frame-src-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/function-constructor-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/function-constructor-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/icon-allowed.sub.html": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/icon-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/icon-blocked.sub.html": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/icon-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/iframe-inside-csp.sub.html": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/iframe-inside-csp.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/image-allowed.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/image-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html.sub.headers": [
+   "content-security-policy/embedded-enforcement/support/echo-allow-csp-from.py": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers": [
+   "content-security-policy/embedded-enforcement/support/echo-policy-multiple.py": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html.sub.headers": [
+   "content-security-policy/embedded-enforcement/support/echo-required-csp.py": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html.sub.headers": [
+   "content-security-policy/embedded-enforcement/support/testharness-helper.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html.sub.headers": [
+   "content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html.sub.headers": [
+   "content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/inline-style-allowed.sub.html.sub.headers": [
+   "content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html.sub.headers": [
+   "content-security-policy/frame-ancestors/support/frame-ancestors-test.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html.sub.headers": [
+   "content-security-policy/frame-ancestors/support/frame-ancestors.sub.html": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html.sub.headers": [
+   "content-security-policy/frame-ancestors/support/frame-ancestors.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/inline-style-blocked.sub.html.sub.headers": [
+   "content-security-policy/frame-ancestors/support/frame-in-frame.sub.html": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/manifest-src-allowed.sub.html.sub.headers": [
+   "content-security-policy/frame-ancestors/support/frame-in-frame.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/manifest-src-blocked.sub.html.sub.headers": [
+   "content-security-policy/frame-src/frame-src-redirect.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/media-src-allowed.sub.html": [
+   "content-security-policy/frame-src/support/frame.html": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/media-src-allowed.sub.html.sub.headers": [
+   "content-security-policy/frame-src/support/testharness-helper.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/media-src-blocked.sub.html": [
+   "content-security-policy/generic/fail-0_1.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/media-src-blocked.sub.html.sub.headers": [
+   "content-security-policy/generic/negativeTests.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/media-src-track-block.sub.html.sub.headers": [
+   "content-security-policy/generic/no-default-src.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html.sub.headers": [
+   "content-security-policy/generic/pass-0_1.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html.sub.headers": [
+   "content-security-policy/generic/positiveTest.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html.sub.headers": [
+   "content-security-policy/generic/support/log-pass.html": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/object-src-url-allowed.sub.html.sub.headers": [
+   "content-security-policy/generic/support/sandboxed-eval.sub.html": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/object-src-url-blocked.sub.html.sub.headers": [
+   "content-security-policy/generic/support/sandboxed-eval.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html": [
+   "content-security-policy/generic/unreached.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html.sub.headers": [
+   "content-security-policy/generic/wildcardHostTest.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/report-blocked-data-uri.sub.html.sub.headers": [
+   "content-security-policy/generic/wildcardHostTestFailure.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html.sub.headers": [
+   "content-security-policy/generic/wildcardHostTestSuceeds.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html.sub.headers": [
+   "content-security-policy/generic/wildcardPortTest.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html.sub.headers": [
+   "content-security-policy/generic/wildcardPortTestSuceeds.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html.sub.headers": [
+   "content-security-policy/inside-worker/support/connect-src-allow.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/report-uri-from-javascript.sub.html.sub.headers": [
+   "content-security-policy/inside-worker/support/connect-src-self.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/report-uri.sub.html": [
+   "content-security-policy/inside-worker/support/script-src-allow.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/report-uri.sub.html.sub.headers": [
+   "content-security-policy/inside-worker/support/script-src-self.sub.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/alert-fail.html": [
+   "content-security-policy/meta/combine-header-and-meta-policies.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/alert-pass.html": [
+   "content-security-policy/meta/meta-outside-head.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/blue.css": [
+   "content-security-policy/meta/support/metaHelper.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/document-write-alert-fail.js": [
+   "content-security-policy/navigation/support/test_csp_self_window.sub.html": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/generate-csp-report.html": [
+   "content-security-policy/navigation/support/test_csp_self_window.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/go-to-echo-report.js": [
+   "content-security-policy/nonce-hiding/script-nonces-hidden.tentative.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/inject-image.js": [
+   "content-security-policy/nonce-hiding/svgscript-nonces-hidden.tentative.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/inject-script.js": [
+   "content-security-policy/object-src/object-src-2_1.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/inject-style.js": [
+   "content-security-policy/object-src/object-src-2_2.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/post-message.js": [
+   "content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/postmessage-fail.html": [
+   "content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/postmessage-pass.html": [
+   "content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/script.js": [
+   "content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/set-cookie.js.sub.headers": [
+   "content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/shared-worker-make-xhr-allowed.sub.js": [
+   "content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js": [
+   "content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js.sub.headers": [
+   "content-security-policy/sandbox/support/sandboxed-eval.sub.html": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/simple-event-stream": [
+   "content-security-policy/sandbox/support/sandboxed-eval.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/simple-event-stream.headers": [
+   "content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/track.vtt": [
+   "content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-eval.js": [
+   "content-security-policy/script-src/10_1_support_1.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-eval.js.sub.headers": [
+   "content-security-policy/script-src/10_1_support_2.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-function-function.js": [
+   "content-security-policy/script-src/addInlineTestsWithDOMManipulation.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-function-function.js.sub.headers": [
+   "content-security-policy/script-src/buildInlineWorker.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-importscripts.js": [
+   "content-security-policy/script-src/crossoriginScript.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-importscripts.js.sub.headers": [
+   "content-security-policy/script-src/crossoriginScript.js.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-make-xhr-blocked.sub.js": [
+   "content-security-policy/script-src/externalScript.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-make-xhr-blocked.sub.js.sub.headers": [
+   "content-security-policy/script-src/inlineSuccessTest.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-make-xhr.sub.js": [
+   "content-security-policy/script-src/inlineTests.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-set-timeout.js": [
+   "content-security-policy/script-src/javascript-window-open-blocked.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/resources/worker-set-timeout.js.sub.headers": [
+   "content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html": [
+   "content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html": [
+   "content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-sri_hash.sub.html.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html": [
+   "content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_eval.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_new_function.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/sandbox-empty.sub.html": [
+   "content-security-policy/script-src/script-src-strict_dynamic_discard_whitelist.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/sandbox-empty.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_double_policy_honor_whitelist.sub.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_eval.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_hashes.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/style-allowed.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_new_function.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/style-blocked.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-eval-blocked.sub.html.sub.headers": [
+   "content-security-policy/script-src/script-src-strict_dynamic_parser_inserted_correct_nonce.html.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-from-guid.sub.html.sub.headers": [
+   "content-security-policy/script-src/simpleSourcedScript.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-function-function-blocked.sub.html.sub.headers": [
+   "content-security-policy/script-src/support/inject-script.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html.sub.headers": [
+   "content-security-policy/script-src/support/post-message.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-script-src.sub.html.sub.headers": [
+   "content-security-policy/script-src/support/worker-eval.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html.sub.headers": [
+   "content-security-policy/script-src/support/worker-eval.js.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/xsl-blocked-expected.png": [
+   "content-security-policy/script-src/support/worker-function-function.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/xsl-unaffected-by-style-src-1-expected.png": [
+   "content-security-policy/script-src/support/worker-function-function.js.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html.sub.headers": [
+   "content-security-policy/script-src/support/worker-importscripts.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html.sub.headers": [
+   "content-security-policy/script-src/support/worker-importscripts.js.sub.headers": [
     [
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-allowed.sub.html.sub.headers": [
+   "content-security-policy/script-src/support/worker-set-timeout.js": [
     [
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/child-src/child-src-conflicting-frame-src.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/child-src/child-src-cross-origin-load.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/child-src/child-src-redirect-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/embedded-enforcement/support/echo-allow-csp-from.py": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/embedded-enforcement/support/echo-policy-multiple.py": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/embedded-enforcement/support/echo-required-csp.py": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/embedded-enforcement/support/testharness-helper.sub.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/frame-ancestors/support/frame-ancestors-test.sub.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/frame-ancestors/support/frame-ancestors.sub.html": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/frame-ancestors/support/frame-ancestors.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/frame-ancestors/support/frame-in-frame.sub.html": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/frame-ancestors/support/frame-in-frame.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/frame-src/frame-src-redirect.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/frame-src/support/frame.html": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/frame-src/support/testharness-helper.sub.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/fail-0_1.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/generic-0_1-img-src.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/generic-0_1-script-src.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/generic-0_10.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/generic-0_10_1.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/generic-0_2.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/generic-0_2_2.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/generic-0_2_3.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/generic-0_8.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/generic-0_8_1.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/generic-0_9.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/negativeTests.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/no-default-src.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/pass-0_1.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/positiveTest.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/unreached.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/wildcardHostTest.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/wildcardHostTestFailure.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/wildcardHostTestSuceeds.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/wildcardPortTest.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/generic/wildcardPortTestSuceeds.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/inside-worker/support/connect-src-allow.sub.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/inside-worker/support/connect-src-self.sub.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/inside-worker/support/script-src-allow.sub.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/inside-worker/support/script-src-self.sub.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/media-src/media-src-7_1.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/media-src/media-src-7_1_2.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/media-src/media-src-7_2.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/media-src/media-src-7_2_2.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/media-src/media-src-7_3.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/media-src/media-src-7_3_2.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/media-src/media-src-blocked.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/navigation/support/test_csp_self_window.sub.html": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/navigation/support/test_csp_self_window.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/nonce-hiding/script-nonces-hidden.tentative.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/nonce-hiding/svgscript-nonces-hidden.tentative.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/object-src/object-src-2_1.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/object-src/object-src-2_2.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/10_1_support_1.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/10_1_support_2.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/addInlineTestsWithDOMManipulation.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/buildInlineWorker.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/crossoriginScript.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/crossoriginScript.js.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/externalScript.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/inlineSuccessTest.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/inlineTests.js": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/javascript-window-open-blocked.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-1_1.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-1_10.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-1_10_1.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-1_2.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-1_2_1.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-1_3.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-1_4.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-1_4_1.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-1_4_2.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-sri_hash.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_eval.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_new_function.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_discard_whitelist.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_double_policy_honor_whitelist.sub.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_eval.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_hashes.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_new_function.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/script-src-strict_dynamic_parser_inserted_correct_nonce.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "content-security-policy/script-src/simpleSourcedScript.js": [
+   "content-security-policy/script-src/support/worker-set-timeout.js.sub.headers": [
     [
      {}
     ]
@@ -206091,6 +205719,11 @@
      {}
     ]
    ],
+   "content-security-policy/style-src/resources/allowed.css": [
+    [
+     {}
+    ]
+   ],
    "content-security-policy/style-src/resources/style-src-import.sub.css": [
     [
      {}
@@ -206111,6 +205744,11 @@
      {}
     ]
    ],
+   "content-security-policy/style-src/support/inject-style.js": [
+    [
+     {}
+    ]
+   ],
    "content-security-policy/support/alert-pass.js": [
     [
      {}
@@ -206126,6 +205764,11 @@
      {}
     ]
    ],
+   "content-security-policy/support/document-write-alert-fail.js": [
+    [
+     {}
+    ]
+   ],
    "content-security-policy/support/echo-policy.py": [
     [
      {}
@@ -206171,6 +205814,11 @@
      {}
     ]
    ],
+   "content-security-policy/support/manifest.json": [
+    [
+     {}
+    ]
+   ],
    "content-security-policy/support/media/flash.swf": [
     [
      {}
@@ -206246,11 +205894,6 @@
      {}
     ]
    ],
-   "content-security-policy/svg/svg-inline.sub.html.sub.headers": [
-    [
-     {}
-    ]
-   ],
    "cookies/path/echo-cookie.html": [
     [
      {}
@@ -230561,11 +230204,6 @@
      {}
     ]
    ],
-   "css/css-flexbox-1/support/check-layout-th.js": [
-    [
-     {}
-    ]
-   ],
    "css/css-flexbox-1/support/flexbox.css": [
     [
      {}
@@ -230806,6 +230444,36 @@
      {}
     ]
    ],
+   "css/css-fonts-3/font-stretch-pass-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-synthesis-01-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-synthesis-02-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-synthesis-03-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-synthesis-04-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-synthesis-05-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-fonts-3/font-variant-01-ref.html": [
     [
      {}
@@ -231281,6 +230949,26 @@
      {}
     ]
    ],
+   "css/css-fonts-3/support/fonts/Exo-DemiBold.otf": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts-3/support/fonts/Exo2-SemiBold.otf": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts-3/support/fonts/Exo2-SemiBoldCondensed.otf": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts-3/support/fonts/Exo2-SemiBoldExpanded.otf": [
+    [
+     {}
+    ]
+   ],
    "css/css-fonts-3/support/fonts/FontWithFancyFeatures.otf": [
     [
      {}
@@ -231316,6 +231004,11 @@
      {}
     ]
    ],
+   "css/css-fonts-3/support/fonts/fail.woff": [
+    [
+     {}
+    ]
+   ],
    "css/css-fonts-3/support/fonts/font-feature-settings-rendering-2-expected.html": [
     [
      {}
@@ -238566,6 +238259,11 @@
      {}
     ]
    ],
+   "css/css-fonts-3/support/fonts/pass.woff": [
+    [
+     {}
+    ]
+   ],
    "css/css-fonts-3/support/green15x15.png": [
     [
      {}
@@ -238901,6 +238599,16 @@
      {}
     ]
    ],
+   "css/css-grid-1/grid-definition/grid-template-columns-fit-content-001-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-grid-1/grid-definition/grid-template-rows-fit-content-001-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-grid-1/grid-definition/support/testing-utils.js": [
     [
      {}
@@ -239021,11 +238729,6 @@
      {}
     ]
    ],
-   "css/css-grid-1/support/check-layout-th.js": [
-    [
-     {}
-    ]
-   ],
    "css/css-grid-1/support/grid-alignment.css": [
     [
      {}
@@ -239071,6 +238774,11 @@
      {}
     ]
    ],
+   "css/css-images-3/gradients-with-transparent-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-images-3/linear-gradient-ref.html": [
     [
      {}
@@ -242716,11 +242424,6 @@
      {}
     ]
    ],
-   "css/css-tables-3/support/check-layout-th.js": [
-    [
-     {}
-    ]
-   ],
    "css/css-tables-3/tools/markup-generator.html": [
     [
      {}
@@ -252356,6 +252059,11 @@
      {}
     ]
    ],
+   "css/css3-color/t44-currentcolor-inherited-c-ref.xht": [
+    [
+     {}
+    ]
+   ],
    "css/css3-selectors/CHANGES": [
     [
      {}
@@ -254191,6 +253899,11 @@
      {}
     ]
    ],
+   "css/filter-effects-1/parsing/resources/parsing-testcommon.js": [
+    [
+     {}
+    ]
+   ],
    "css/filter-effects-1/reference/filters-opacity-001-ref.html": [
     [
      {}
@@ -262311,6 +262024,11 @@
      {}
     ]
    ],
+   "fetch/api/resources/keepalive-iframe.html": [
+    [
+     {}
+    ]
+   ],
    "fetch/api/resources/method.py": [
     [
      {}
@@ -269731,6 +269449,11 @@
      {}
     ]
    ],
+   "html/editing/focus/processing-model/support/preventScroll-helper.html": [
+    [
+     {}
+    ]
+   ],
    "html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/.gitkeep": [
     [
      {}
@@ -272771,6 +272494,16 @@
      {}
     ]
    ],
+   "html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-dependent.js": [
+    [
+     {}
+    ]
+   ],
+   "html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-root.js": [
+    [
+     {}
+    ]
+   ],
    "html/semantics/scripting-1/the-script-element/module/import-something-namespace.js": [
     [
      {}
@@ -272961,6 +272694,16 @@
      {}
     ]
    ],
+   "html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis": [
+    [
+     {}
+    ]
+   ],
+   "html/semantics/scripting-1/the-script-element/module/resources/500-but-js.asis": [
+    [
+     {}
+    ]
+   ],
    "html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py": [
     [
      {}
@@ -272996,6 +272739,21 @@
      {}
     ]
    ],
+   "html/semantics/scripting-1/the-script-element/module/resources/imports-404-but-js.js": [
+    [
+     {}
+    ]
+   ],
+   "html/semantics/scripting-1/the-script-element/module/resources/imports-500-but-js.js": [
+    [
+     {}
+    ]
+   ],
+   "html/semantics/scripting-1/the-script-element/module/resources/imports-b-cross-origin.sub.js": [
+    [
+     {}
+    ]
+   ],
    "html/semantics/scripting-1/the-script-element/module/set-currentScript-on-window.js": [
     [
      {}
@@ -274496,6 +274254,11 @@
      {}
     ]
    ],
+   "interfaces/ambient-light.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/clipboard.idl": [
     [
      {}
@@ -274576,6 +274339,11 @@
      {}
     ]
    ],
+   "interfaces/wake-lock.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/web-share.idl": [
     [
      {}
@@ -274666,6 +274434,11 @@
      {}
     ]
    ],
+   "longtask-timing/shared-renderer/resources/frame-with-longtask.html": [
+    [
+     {}
+    ]
+   ],
    "magnetometer/OWNERS": [
     [
      {}
@@ -275306,657 +275079,577 @@
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html.headers": [
+   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.headers": [
+   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+   "mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html.headers": [
+   "mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+   "mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.headers": [
+   "mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+   "mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html.headers": [
+   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html.headers": [
+   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html.headers": [
+   "mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html.headers": [
+   "mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/common.js": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/expect.py": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/mixed-content-test-case.js": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/sanity-checker.js": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/template/disclaimer.template": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/template/spec_json.js.template": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/template/test.debug.html.template": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/template/test.js.template": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/template/test.release.html.template": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/template/test_description.template": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/tools/__init__.py": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/tools/clean.py": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/tools/common_paths.py": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/tools/generate.py": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/tools/regenerate": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/tools/spec_validator.py": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/generic/worker.js": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers": [
+   "mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers": [
+   "mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers": [
+   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers": [
+   "mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers": [
+   "mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers": [
+   "mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/common.js": [
+   "mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/expect.py": [
+   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/mixed-content-test-case.js": [
+   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/sanity-checker.js": [
+   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/template/disclaimer.template": [
+   "mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/template/spec_json.js.template": [
+   "mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/template/test.debug.html.template": [
+   "mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/template/test.js.template": [
+   "mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/template/test.release.html.template": [
+   "mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/template/test_description.template": [
+   "mixed-content/spec.src.json": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/tools/__init__.py": [
+   "mixed-content/spec_json.js": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/tools/clean.py": [
+   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/tools/common_paths.py": [
+   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/tools/generate.py": [
+   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/tools/regenerate": [
+   "mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/tools/spec_validator.py": [
+   "mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/generic/worker.js": [
+   "mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+   "mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/spec.src.json": [
+   "mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
    ],
-   "mixed-content/spec_json.js": [
+   "mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
     [
      {}
     ]
@@ -279436,16 +279129,6 @@
      {}
     ]
    ],
-   "security/support/window-name-navigation.sub.html": [
-    [
-     {}
-    ]
-   ],
-   "security/support/window-name-test.sub.html": [
-    [
-     {}
-    ]
-   ],
    "selection/OWNERS": [
     [
      {}
@@ -280731,16 +280414,6 @@
      {}
     ]
    ],
-   "service-workers/service-worker/resources/request-body-blob-iframe.html": [
-    [
-     {}
-    ]
-   ],
-   "service-workers/service-worker/resources/request-body-blob-worker.js": [
-    [
-     {}
-    ]
-   ],
    "service-workers/service-worker/resources/request-end-to-end-worker.js": [
     [
      {}
@@ -282191,7 +281864,12 @@
      {}
     ]
    ],
-   "viewport/viewport_support.js": [
+   "visual-viewport/OWNERS": [
+    [
+     {}
+    ]
+   ],
+   "visual-viewport/viewport_support.js": [
     [
      {}
     ]
@@ -282226,6 +281904,11 @@
      {}
     ]
    ],
+   "wake-lock/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "wasm/compile_worker.js": [
     [
      {}
@@ -282356,6 +282039,26 @@
      {}
     ]
    ],
+   "webaudio/chrome/resources/audioparam-testing.js": [
+    [
+     {}
+    ]
+   ],
+   "webaudio/chrome/resources/audit-util.js": [
+    [
+     {}
+    ]
+   ],
+   "webaudio/chrome/resources/audit.js": [
+    [
+     {}
+    ]
+   ],
+   "webaudio/chrome/resources/start-stop-exceptions.js": [
+    [
+     {}
+    ]
+   ],
    "webaudio/js/buffer-loader.js": [
     [
      {}
@@ -282596,6 +282299,11 @@
      {}
     ]
    ],
+   "webdriver/tests/sessions/new_session/support/__init__.py": [
+    [
+     {}
+    ]
+   ],
    "webdriver/tests/sessions/new_session/support/create.py": [
     [
      {}
@@ -293891,11 +293599,31 @@
      {}
     ]
    ],
+   "worklets/resources/referrer-tests.js": [
+    [
+     {}
+    ]
+   ],
+   "worklets/resources/referrer-window.html": [
+    [
+     {}
+    ]
+   ],
+   "worklets/resources/referrer.py": [
+    [
+     {}
+    ]
+   ],
    "worklets/resources/throwing-worklet-script.js": [
     [
      {}
     ]
    ],
+   "worklets/resources/worklet-test-utils.js": [
+    [
+     {}
+    ]
+   ],
    "x-frame-options/support/helper.js": [
     [
      {}
@@ -298999,6 +298727,12 @@
      {}
     ]
    ],
+   "IndexedDB/idbcursor-request-source.html": [
+    [
+     "/IndexedDB/idbcursor-request-source.html",
+     {}
+    ]
+   ],
    "IndexedDB/idbcursor-reused.htm": [
     [
      "/IndexedDB/idbcursor-reused.htm",
@@ -299761,6 +299495,12 @@
      }
     ]
    ],
+   "IndexedDB/idbindex-request-source.html": [
+    [
+     "/IndexedDB/idbindex-request-source.html",
+     {}
+    ]
+   ],
    "IndexedDB/idbindex_count.htm": [
     [
      "/IndexedDB/idbindex_count.htm",
@@ -300027,6 +299767,12 @@
      }
     ]
    ],
+   "IndexedDB/idbobjectstore-request-source.html": [
+    [
+     "/IndexedDB/idbobjectstore-request-source.html",
+     {}
+    ]
+   ],
    "IndexedDB/idbobjectstore-transaction-SameObject.html": [
     [
      "/IndexedDB/idbobjectstore-transaction-SameObject.html",
@@ -303777,747 +303523,189 @@
      {}
     ]
    ],
-   "content-security-policy/blink-contrib-2/base-uri-allow.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/base-uri-allow.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/base-uri-deny.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/base-uri-deny.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/meta-outside-head.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/meta-outside-head.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html": [
-    [
-     "/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scripthash-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scripthash-default-src.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/stylehash-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/stylehash-default-src.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/stylehash-default-src.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/blob-urls-match-blob.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/blob-urls-match-blob.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html": [
+   "content-security-policy/blob/blob-urls-do-not-match-self.sub.html": [
     [
-     "/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html",
+     "/content-security-policy/blob/blob-urls-do-not-match-self.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/default-src-inline-allowed.sub.html": [
+   "content-security-policy/blob/blob-urls-match-blob.sub.html": [
     [
-     "/content-security-policy/blink-contrib/default-src-inline-allowed.sub.html",
+     "/content-security-policy/blob/blob-urls-match-blob.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/default-src-inline-blocked.sub.html": [
+   "content-security-policy/blob/self-doesnt-match-blob.sub.html": [
     [
-     "/content-security-policy/blink-contrib/default-src-inline-blocked.sub.html",
+     "/content-security-policy/blob/self-doesnt-match-blob.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/duplicate-directive.sub.html": [
+   "content-security-policy/blob/star-doesnt-match-blob.sub.html": [
     [
-     "/content-security-policy/blink-contrib/duplicate-directive.sub.html",
+     "/content-security-policy/blob/star-doesnt-match-blob.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/eval-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/eval-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/eval-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/frame-src-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/frame-src-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/frame-src-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/frame-src-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/function-constructor-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/function-constructor-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/function-constructor-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/function-constructor-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/image-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/image-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/image-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/image-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/inline-style-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/inline-style-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/inline-style-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/inline-style-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/media-src-track-block.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/media-src-track-block.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/object-src-url-allowed.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/object-src-url-allowed.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/object-src-url-blocked.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/object-src-url-blocked.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/report-blocked-data-uri.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/report-blocked-data-uri.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/report-uri-from-javascript.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/report-uri-from-javascript.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html": [
-    [
-     "/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html": [
+   "content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html": [
     [
-     "/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html",
+     "/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html": [
+   "content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html": [
     [
-     "/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html",
+     "/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html": [
+   "content-security-policy/child-src/child-src-allowed.sub.html": [
     [
-     "/content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html",
+     "/content-security-policy/child-src/child-src-allowed.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html": [
+   "content-security-policy/child-src/child-src-blocked.sub.html": [
     [
-     "/content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html",
+     "/content-security-policy/child-src/child-src-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html": [
+   "content-security-policy/child-src/child-src-conflicting-frame-src.sub.html": [
     [
-     "/content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html",
+     "/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/style-allowed.sub.html": [
+   "content-security-policy/child-src/child-src-cross-origin-load.sub.html": [
     [
-     "/content-security-policy/blink-contrib/style-allowed.sub.html",
+     "/content-security-policy/child-src/child-src-cross-origin-load.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/style-blocked.sub.html": [
+   "content-security-policy/child-src/child-src-redirect-blocked.sub.html": [
     [
-     "/content-security-policy/blink-contrib/style-blocked.sub.html",
+     "/content-security-policy/child-src/child-src-redirect-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html": [
+   "content-security-policy/child-src/child-src-worker-allowed.sub.html": [
     [
-     "/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html",
+     "/content-security-policy/child-src/child-src-worker-allowed.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html": [
+   "content-security-policy/child-src/child-src-worker-blocked.sub.html": [
     [
-     "/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html",
+     "/content-security-policy/child-src/child-src-worker-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-eval-blocked.sub.html": [
+   "content-security-policy/connect-src/connect-src-beacon-allowed.sub.html": [
     [
-     "/content-security-policy/blink-contrib/worker-eval-blocked.sub.html",
+     "/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-from-guid.sub.html": [
+   "content-security-policy/connect-src/connect-src-beacon-blocked.sub.html": [
     [
-     "/content-security-policy/blink-contrib/worker-from-guid.sub.html",
+     "/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-function-function-blocked.sub.html": [
+   "content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html": [
     [
-     "/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html",
+     "/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html": [
+   "content-security-policy/connect-src/connect-src-eventsource-allowed.sub.html": [
     [
-     "/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html",
+     "/content-security-policy/connect-src/connect-src-eventsource-allowed.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-script-src.sub.html": [
+   "content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html": [
     [
-     "/content-security-policy/blink-contrib/worker-script-src.sub.html",
+     "/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html": [
+   "content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html": [
     [
-     "/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html",
+     "/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html": [
+   "content-security-policy/connect-src/connect-src-websocket-allowed.sub.html": [
     [
-     "/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html",
+     "/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html",
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html": [
-    [
-     "/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html",
-     {}
-    ]
-   ],
-   "content-security-policy/child-src/child-src-allowed.sub.html": [
+   "content-security-policy/connect-src/connect-src-websocket-blocked.sub.html": [
     [
-     "/content-security-policy/child-src/child-src-allowed.sub.html",
+     "/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-blocked.sub.html": [
+   "content-security-policy/connect-src/connect-src-xmlhttprequest-allowed.sub.html": [
     [
-     "/content-security-policy/child-src/child-src-blocked.sub.html",
+     "/content-security-policy/connect-src/connect-src-xmlhttprequest-allowed.sub.html",
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-conflicting-frame-src.sub.html": [
+   "content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html": [
     [
-     "/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html",
+     "/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-cross-origin-load.sub.html": [
+   "content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html": [
     [
-     "/content-security-policy/child-src/child-src-cross-origin-load.sub.html",
+     "/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-redirect-blocked.sub.html": [
+   "content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html": [
     [
-     "/content-security-policy/child-src/child-src-redirect-blocked.sub.html",
+     "/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html",
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-worker-allowed.sub.html": [
+   "content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html": [
     [
-     "/content-security-policy/child-src/child-src-worker-allowed.sub.html",
+     "/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/child-src/child-src-worker-blocked.sub.html": [
+   "content-security-policy/connect-src/worker-connect-src-allowed.sub.html": [
     [
-     "/content-security-policy/child-src/child-src-worker-blocked.sub.html",
+     "/content-security-policy/connect-src/worker-connect-src-allowed.sub.html",
      {}
     ]
    ],
-   "content-security-policy/connect-src/connect-src-beacon-blocked.sub.html": [
+   "content-security-policy/connect-src/worker-connect-src-blocked.sub.html": [
     [
-     "/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html",
+     "/content-security-policy/connect-src/worker-connect-src-blocked.sub.html",
      {}
     ]
    ],
-   "content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html": [
+   "content-security-policy/connect-src/worker-from-guid.sub.html": [
     [
-     "/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html",
+     "/content-security-policy/connect-src/worker-from-guid.sub.html",
      {}
     ]
    ],
-   "content-security-policy/connect-src/connect-src-websocket-blocked.sub.html": [
+   "content-security-policy/default-src/default-src-inline-allowed.sub.html": [
     [
-     "/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html",
+     "/content-security-policy/default-src/default-src-inline-allowed.sub.html",
      {}
     ]
    ],
-   "content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html": [
+   "content-security-policy/default-src/default-src-inline-blocked.sub.html": [
     [
-     "/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html",
+     "/content-security-policy/default-src/default-src-inline-blocked.sub.html",
      {}
     ]
    ],
@@ -304647,6 +303835,48 @@
      {}
     ]
    ],
+   "content-security-policy/form-action/form-action-src-allowed.sub.html": [
+    [
+     "/content-security-policy/form-action/form-action-src-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/form-action/form-action-src-blocked.sub.html": [
+    [
+     "/content-security-policy/form-action/form-action-src-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/form-action/form-action-src-default-ignored.sub.html": [
+    [
+     "/content-security-policy/form-action/form-action-src-default-ignored.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/form-action/form-action-src-get-allowed.sub.html": [
+    [
+     "/content-security-policy/form-action/form-action-src-get-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/form-action/form-action-src-get-blocked.sub.html": [
+    [
+     "/content-security-policy/form-action/form-action-src-get-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/form-action/form-action-src-javascript-blocked.sub.html": [
+    [
+     "/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/form-action/form-action-src-redirect-blocked.sub.html": [
+    [
+     "/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html": [
     [
      "/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html",
@@ -304821,6 +304051,36 @@
      {}
     ]
    ],
+   "content-security-policy/frame-src/frame-src-about-blank-allowed-by-default.sub.html": [
+    [
+     "/content-security-policy/frame-src/frame-src-about-blank-allowed-by-default.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/frame-src/frame-src-about-blank-allowed-by-scheme.sub.html": [
+    [
+     "/content-security-policy/frame-src/frame-src-about-blank-allowed-by-scheme.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/frame-src/frame-src-allowed.sub.html": [
+    [
+     "/content-security-policy/frame-src/frame-src-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/frame-src/frame-src-blocked.sub.html": [
+    [
+     "/content-security-policy/frame-src/frame-src-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/frame-src/frame-src-cross-origin-load.sub.html": [
+    [
+     "/content-security-policy/frame-src/frame-src-cross-origin-load.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/frame-src/frame-src-redirect.html": [
     [
      "/content-security-policy/frame-src/frame-src-redirect.html",
@@ -304833,6 +304093,24 @@
      {}
     ]
    ],
+   "content-security-policy/generic/duplicate-directive.sub.html": [
+    [
+     "/content-security-policy/generic/duplicate-directive.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html": [
+    [
+     "/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/generic/filesystem-urls-match-filesystem.sub.html": [
+    [
+     "/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/generic/generic-0_1-img-src.html": [
     [
      "/content-security-policy/generic/generic-0_1-img-src.html",
@@ -304875,9 +304153,9 @@
      {}
     ]
    ],
-   "content-security-policy/generic/generic-0_8.html": [
+   "content-security-policy/generic/generic-0_8.sub.html": [
     [
-     "/content-security-policy/generic/generic-0_8.html",
+     "/content-security-policy/generic/generic-0_8.sub.html",
      {}
     ]
    ],
@@ -304899,6 +304177,24 @@
      {}
     ]
    ],
+   "content-security-policy/generic/policy-does-not-affect-child.sub.html": [
+    [
+     "/content-security-policy/generic/policy-does-not-affect-child.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/img-src/icon-allowed.sub.html": [
+    [
+     "/content-security-policy/img-src/icon-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/img-src/icon-blocked.sub.html": [
+    [
+     "/content-security-policy/img-src/icon-blocked.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/img-src/img-src-4_1.sub.html": [
     [
      "/content-security-policy/img-src/img-src-4_1.sub.html",
@@ -304941,6 +304237,12 @@
      {}
     ]
    ],
+   "content-security-policy/img-src/report-blocked-data-uri.sub.html": [
+    [
+     "/content-security-policy/img-src/report-blocked-data-uri.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/inheritance/iframe.html": [
     [
      "/content-security-policy/inheritance/iframe.html",
@@ -304986,9 +304288,7 @@
    "content-security-policy/media-src/media-src-7_1_2.sub.html": [
     [
      "/content-security-policy/media-src/media-src-7_1_2.sub.html",
-     {
-      "timeout": "long"
-     }
+     {}
     ]
    ],
    "content-security-policy/media-src/media-src-7_2.html": [
@@ -305000,9 +304300,7 @@
    "content-security-policy/media-src/media-src-7_2_2.sub.html": [
     [
      "/content-security-policy/media-src/media-src-7_2_2.sub.html",
-     {
-      "timeout": "long"
-     }
+     {}
     ]
    ],
    "content-security-policy/media-src/media-src-7_3.sub.html": [
@@ -305020,9 +304318,7 @@
    "content-security-policy/media-src/media-src-blocked.sub.html": [
     [
      "/content-security-policy/media-src/media-src-blocked.sub.html",
-     {
-      "timeout": "long"
-     }
+     {}
     ]
    ],
    "content-security-policy/media-src/media-src-redir-bug.sub.html": [
@@ -305031,6 +304327,12 @@
      {}
     ]
    ],
+   "content-security-policy/meta/combine-header-and-meta-policies.sub.html": [
+    [
+     "/content-security-policy/meta/combine-header-and-meta-policies.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/meta/meta-img-src.html": [
     [
      "/content-security-policy/meta/meta-img-src.html",
@@ -305043,6 +304345,12 @@
      {}
     ]
    ],
+   "content-security-policy/meta/meta-outside-head.sub.html": [
+    [
+     "/content-security-policy/meta/meta-outside-head.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/navigation/javascript-url-navigation-inherits-csp.html": [
     [
      "/content-security-policy/navigation/javascript-url-navigation-inherits-csp.html",
@@ -305101,12 +304409,146 @@
      }
     ]
    ],
+   "content-security-policy/object-src/object-src-no-url-allowed.sub.html": [
+    [
+     "/content-security-policy/object-src/object-src-no-url-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/object-src/object-src-no-url-blocked.sub.html": [
+    [
+     "/content-security-policy/object-src/object-src-no-url-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/object-src/object-src-url-allowed.sub.html": [
+    [
+     "/content-security-policy/object-src/object-src-url-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/object-src/object-src-url-blocked.sub.html": [
+    [
+     "/content-security-policy/object-src/object-src-url-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html": [
+    [
+     "/content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html": [
+    [
+     "/content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/plugin-types/plugintypes-notype-data.sub.html": [
+    [
+     "/content-security-policy/plugin-types/plugintypes-notype-data.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/plugin-types/plugintypes-notype-url.sub.html": [
+    [
+     "/content-security-policy/plugin-types/plugintypes-notype-url.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html": [
+    [
+     "/content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html": [
+    [
+     "/content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html": [
+    [
+     "/content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html": [
+    [
+     "/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html": [
+    [
+     "/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html": [
+    [
+     "/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html": [
+    [
+     "/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/reporting/securitypolicyviolation-idl.html": [
     [
      "/content-security-policy/reporting/securitypolicyviolation-idl.html",
      {}
     ]
    ],
+   "content-security-policy/sandbox/iframe-inside-csp.sub.html": [
+    [
+     "/content-security-policy/sandbox/iframe-inside-csp.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html": [
+    [
+     "/content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/sandbox/sandbox-allow-scripts.sub.html": [
+    [
+     "/content-security-policy/sandbox/sandbox-allow-scripts.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/sandbox/sandbox-empty-subframe.sub.html": [
+    [
+     "/content-security-policy/sandbox/sandbox-empty-subframe.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/sandbox/sandbox-empty.sub.html": [
+    [
+     "/content-security-policy/sandbox/sandbox-empty.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/injected-inline-script-allowed.sub.html": [
+    [
+     "/content-security-policy/script-src/injected-inline-script-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/injected-inline-script-blocked.sub.html": [
+    [
+     "/content-security-policy/script-src/injected-inline-script-blocked.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/script-src/javascript-window-open-blocked.html": [
     [
      "/content-security-policy/script-src/javascript-window-open-blocked.html",
@@ -305179,6 +304621,12 @@
      {}
     ]
    ],
+   "content-security-policy/script-src/script-src-overrides-default-src.sub.html": [
+    [
+     "/content-security-policy/script-src/script-src-overrides-default-src.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html": [
     [
      "/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html",
@@ -305305,6 +304753,108 @@
      {}
     ]
    ],
+   "content-security-policy/script-src/script-src-wildcards-disallowed.html": [
+    [
+     "/content-security-policy/script-src/script-src-wildcards-disallowed.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/scripthash-allowed.sub.html": [
+    [
+     "/content-security-policy/script-src/scripthash-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/scripthash-basic-blocked.sub.html": [
+    [
+     "/content-security-policy/script-src/scripthash-basic-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/scripthash-default-src.sub.html": [
+    [
+     "/content-security-policy/script-src/scripthash-default-src.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/scripthash-ignore-unsafeinline.sub.html": [
+    [
+     "/content-security-policy/script-src/scripthash-ignore-unsafeinline.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/scripthash-unicode-normalization.sub.html": [
+    [
+     "/content-security-policy/script-src/scripthash-unicode-normalization.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/scriptnonce-allowed.sub.html": [
+    [
+     "/content-security-policy/script-src/scriptnonce-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/scriptnonce-and-scripthash.sub.html": [
+    [
+     "/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/scriptnonce-basic-blocked.sub.html": [
+    [
+     "/content-security-policy/script-src/scriptnonce-basic-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html": [
+    [
+     "/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/scriptnonce-redirect.sub.html": [
+    [
+     "/content-security-policy/script-src/scriptnonce-redirect.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html": [
+    [
+     "/content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/worker-eval-blocked.sub.html": [
+    [
+     "/content-security-policy/script-src/worker-eval-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/worker-function-function-blocked.sub.html": [
+    [
+     "/content-security-policy/script-src/worker-function-function-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/worker-importscripts-blocked.sub.html": [
+    [
+     "/content-security-policy/script-src/worker-importscripts-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/worker-script-src.sub.html": [
+    [
+     "/content-security-policy/script-src/worker-script-src.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/worker-set-timeout-blocked.sub.html": [
+    [
+     "/content-security-policy/script-src/worker-set-timeout-blocked.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/securitypolicyviolation/blockeduri-eval.html": [
     [
      "/content-security-policy/securitypolicyviolation/blockeduri-eval.html",
@@ -305407,6 +304957,66 @@
      {}
     ]
    ],
+   "content-security-policy/style-src/injected-inline-style-allowed.sub.html": [
+    [
+     "/content-security-policy/style-src/injected-inline-style-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/injected-inline-style-blocked.sub.html": [
+    [
+     "/content-security-policy/style-src/injected-inline-style-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html": [
+    [
+     "/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/inline-style-allowed.sub.html": [
+    [
+     "/content-security-policy/style-src/inline-style-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/inline-style-attribute-allowed.sub.html": [
+    [
+     "/content-security-policy/style-src/inline-style-attribute-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/inline-style-attribute-blocked.sub.html": [
+    [
+     "/content-security-policy/style-src/inline-style-attribute-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/inline-style-attribute-on-html.sub.html": [
+    [
+     "/content-security-policy/style-src/inline-style-attribute-on-html.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/inline-style-blocked.sub.html": [
+    [
+     "/content-security-policy/style-src/inline-style-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/style-allowed.sub.html": [
+    [
+     "/content-security-policy/style-src/style-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/style-blocked.sub.html": [
+    [
+     "/content-security-policy/style-src/style-blocked.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/style-src/style-src-error-event-fires.html": [
     [
      "/content-security-policy/style-src/style-src-error-event-fires.html",
@@ -305539,6 +305149,36 @@
      {}
     ]
    ],
+   "content-security-policy/style-src/stylehash-allowed.sub.html": [
+    [
+     "/content-security-policy/style-src/stylehash-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/stylehash-basic-blocked.sub.html": [
+    [
+     "/content-security-policy/style-src/stylehash-basic-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/stylehash-default-src.sub.html": [
+    [
+     "/content-security-policy/style-src/stylehash-default-src.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/stylenonce-allowed.sub.html": [
+    [
+     "/content-security-policy/style-src/stylenonce-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/style-src/stylenonce-blocked.sub.html": [
+    [
+     "/content-security-policy/style-src/stylenonce-blocked.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/svg/object-in-svg-foreignobject.sub.html": [
     [
      "/content-security-policy/svg/object-in-svg-foreignobject.sub.html",
@@ -305569,6 +305209,66 @@
      {}
     ]
    ],
+   "content-security-policy/unsafe-eval/eval-allowed.sub.html": [
+    [
+     "/content-security-policy/unsafe-eval/eval-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html": [
+    [
+     "/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.sub.html": [
+    [
+     "/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/unsafe-eval/eval-blocked.sub.html": [
+    [
+     "/content-security-policy/unsafe-eval/eval-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html": [
+    [
+     "/content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html": [
+    [
+     "/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html": [
+    [
+     "/content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html": [
+    [
+     "/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/unsafe-eval/function-constructor-allowed.sub.html": [
+    [
+     "/content-security-policy/unsafe-eval/function-constructor-allowed.sub.html",
+     {}
+    ]
+   ],
+   "content-security-policy/unsafe-eval/function-constructor-blocked.sub.html": [
+    [
+     "/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html",
+     {}
+    ]
+   ],
    "content-security-policy/unsafe-hashed-attributes/script_event_handlers_allowed.html": [
     [
      "/content-security-policy/unsafe-hashed-attributes/script_event_handlers_allowed.html",
@@ -307409,6 +307109,12 @@
      {}
     ]
    ],
+   "css/css-grid-1/grid-definition/grid-change-fit-content-argument-001.html": [
+    [
+     "/css/css-grid-1/grid-definition/grid-change-fit-content-argument-001.html",
+     {}
+    ]
+   ],
    "css/css-grid-1/grid-definition/grid-inline-support-flexible-lengths-001.html": [
     [
      "/css/css-grid-1/grid-definition/grid-inline-support-flexible-lengths-001.html",
@@ -307499,6 +307205,12 @@
      {}
     ]
    ],
+   "css/css-grid-1/grid-model/grid-box-sizing-001.html": [
+    [
+     "/css/css-grid-1/grid-model/grid-box-sizing-001.html",
+     {}
+    ]
+   ],
    "css/css-grid-1/grid-model/grid-computed-value-display-floated-items-001.html": [
     [
      "/css/css-grid-1/grid-model/grid-computed-value-display-floated-items-001.html",
@@ -310679,6 +310391,42 @@
      {}
     ]
    ],
+   "css/filter-effects-1/parsing/color-interpolation-filters-parsing-invalid.html": [
+    [
+     "/css/filter-effects-1/parsing/color-interpolation-filters-parsing-invalid.html",
+     {}
+    ]
+   ],
+   "css/filter-effects-1/parsing/color-interpolation-filters-parsing-valid.html": [
+    [
+     "/css/filter-effects-1/parsing/color-interpolation-filters-parsing-valid.html",
+     {}
+    ]
+   ],
+   "css/filter-effects-1/parsing/filter-parsing-invalid.html": [
+    [
+     "/css/filter-effects-1/parsing/filter-parsing-invalid.html",
+     {}
+    ]
+   ],
+   "css/filter-effects-1/parsing/filter-parsing-valid.html": [
+    [
+     "/css/filter-effects-1/parsing/filter-parsing-valid.html",
+     {}
+    ]
+   ],
+   "css/filter-effects-1/parsing/lighting-color-parsing-invalid.html": [
+    [
+     "/css/filter-effects-1/parsing/lighting-color-parsing-invalid.html",
+     {}
+    ]
+   ],
+   "css/filter-effects-1/parsing/lighting-color-parsing-valid.html": [
+    [
+     "/css/filter-effects-1/parsing/lighting-color-parsing-valid.html",
+     {}
+    ]
+   ],
    "css/geometry-1/DOMMatrix-001.html": [
     [
      "/css/geometry-1/DOMMatrix-001.html",
@@ -315957,6 +315705,12 @@
      {}
     ]
    ],
+   "fetch/api/basic/keepalive.html": [
+    [
+     "/fetch/api/basic/keepalive.html",
+     {}
+    ]
+   ],
    "fetch/api/basic/mode-no-cors-worker.html": [
     [
      "/fetch/api/basic/mode-no-cors-worker.html",
@@ -316677,6 +316431,12 @@
      }
     ]
    ],
+   "fetch/api/request/request-keepalive.html": [
+    [
+     "/fetch/api/request/request-keepalive.html",
+     {}
+    ]
+   ],
    "fetch/api/request/request-structure.html": [
     [
      "/fetch/api/request/request-structure.html",
@@ -316979,9 +316739,9 @@
      {}
     ]
    ],
-   "generic-sensor/SensorErrorEvent-constructor.html": [
+   "generic-sensor/SensorErrorEvent-constructor.https.html": [
     [
-     "/generic-sensor/SensorErrorEvent-constructor.html",
+     "/generic-sensor/SensorErrorEvent-constructor.https.html",
      {}
     ]
    ],
@@ -320193,6 +319953,12 @@
      {}
     ]
    ],
+   "html/editing/focus/processing-model/preventScroll.html": [
+    [
+     "/html/editing/focus/processing-model/preventScroll.html",
+     {}
+    ]
+   ],
    "html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html": [
     [
      "/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html",
@@ -324481,18 +324247,36 @@
      {}
     ]
    ],
+   "html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html": [
+    [
+     "/html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html",
+     {}
+    ]
+   ],
    "html/semantics/interactive-elements/the-dialog-element/dialog-open.html": [
     [
      "/html/semantics/interactive-elements/the-dialog-element/dialog-open.html",
      {}
     ]
    ],
+   "html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html": [
+    [
+     "/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html",
+     {}
+    ]
+   ],
    "html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html": [
     [
      "/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html",
      {}
     ]
    ],
+   "html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html": [
+    [
+     "/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html",
+     {}
+    ]
+   ],
    "html/semantics/interactive-elements/the-summary-element/activation-behavior.html": [
     [
      "/html/semantics/interactive-elements/the-summary-element/activation-behavior.html",
@@ -325597,9 +325381,15 @@
      {}
     ]
    ],
-   "html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html": [
+   "html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html": [
+    [
+     "/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html",
+     {}
+    ]
+   ],
+   "html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html": [
     [
-     "/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html",
+     "/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html",
      {}
     ]
    ],
@@ -325719,6 +325509,12 @@
      {}
     ]
    ],
+   "html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html": [
+    [
+     "/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html",
+     {}
+    ]
+   ],
    "html/semantics/scripting-1/the-script-element/module/import-subgraph-404.html": [
     [
      "/html/semantics/scripting-1/the-script-element/module/import-subgraph-404.html",
@@ -328889,6 +328685,12 @@
      {}
     ]
    ],
+   "longtask-timing/shared-renderer/longtask-in-new-window.html": [
+    [
+     "/longtask-timing/shared-renderer/longtask-in-new-window.html",
+     {}
+    ]
+   ],
    "magnetometer/Magnetometer.https.html": [
     [
      "/magnetometer/Magnetometer.https.html",
@@ -329555,9 +329357,9 @@
      {}
     ]
    ],
-   "mediacapture-streams/MediaStream-default-feature-policy.https.sub.html": [
+   "mediacapture-streams/MediaStream-default-feature-policy.https.html": [
     [
-     "/mediacapture-streams/MediaStream-default-feature-policy.https.sub.html",
+     "/mediacapture-streams/MediaStream-default-feature-policy.https.html",
      {}
     ]
    ],
@@ -329615,6 +329417,12 @@
      {}
     ]
    ],
+   "mediacapture-streams/MediaStreamTrack-idl.https.html": [
+    [
+     "/mediacapture-streams/MediaStreamTrack-idl.https.html",
+     {}
+    ]
+   ],
    "mediacapture-streams/MediaStreamTrack-init.https.html": [
     [
      "/mediacapture-streams/MediaStreamTrack-init.https.html",
@@ -329657,1605 +329465,1377 @@
      {}
     ]
    ],
-   "mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html": [
-    [
-     "/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/meta-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/meta-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/meta-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html": [
-    [
-     "/mixed-content/allowed/meta-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/meta-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/meta-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/meta-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/meta-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/meta-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/meta-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html": [
+   "mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html",
+     "/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html": [
+   "mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html",
+     "/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html": [
+   "mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html",
+     "/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html": [
+   "mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html",
+     "/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-    [
-     "/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-    [
-     "/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-    [
-     "/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-    [
-     "/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
-     {}
-    ]
-   ],
-   "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/imageset.https.sub.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/imageset.https.sub.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
+   "mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html",
+     "/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html": [
+   "mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html",
+     "/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/imageset.https.sub.html": [
+   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/imageset.https.sub.html",
+     "/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+   "mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html",
+     "/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
-   "mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
+   "mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
     [
-     "/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html",
+     "/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html",
      {}
     ]
    ],
@@ -341153,6 +340733,12 @@
      {}
     ]
    ],
+   "referrer-policy/generic/iframe-inheritance.html": [
+    [
+     "/referrer-policy/generic/iframe-inheritance.html",
+     {}
+    ]
+   ],
    "referrer-policy/generic/link-rel-prefetch.html": [
     [
      "/referrer-policy/generic/link-rel-prefetch.html",
@@ -349229,9 +348815,9 @@
      {}
     ]
    ],
-   "requestidlecallback/callback-timeout-with-raf.html": [
+   "requestidlecallback/callback-timeout-when-busy.html": [
     [
-     "/requestidlecallback/callback-timeout-with-raf.html",
+     "/requestidlecallback/callback-timeout-when-busy.html",
      {}
     ]
    ],
@@ -349471,42 +349057,6 @@
      {}
     ]
    ],
-   "security/window-name-after-cross-origin-aux-frame-navigation.sub.html": [
-    [
-     "/security/window-name-after-cross-origin-aux-frame-navigation.sub.html",
-     {}
-    ]
-   ],
-   "security/window-name-after-cross-origin-main-frame-navigation.sub.html": [
-    [
-     "/security/window-name-after-cross-origin-main-frame-navigation.sub.html",
-     {}
-    ]
-   ],
-   "security/window-name-after-cross-origin-sub-frame-navigation.sub.html": [
-    [
-     "/security/window-name-after-cross-origin-sub-frame-navigation.sub.html",
-     {}
-    ]
-   ],
-   "security/window-name-after-same-origin-aux-frame-navigation.sub.html": [
-    [
-     "/security/window-name-after-same-origin-aux-frame-navigation.sub.html",
-     {}
-    ]
-   ],
-   "security/window-name-after-same-origin-main-frame-navigation.sub.html": [
-    [
-     "/security/window-name-after-same-origin-main-frame-navigation.sub.html",
-     {}
-    ]
-   ],
-   "security/window-name-after-same-origin-sub-frame-navigation.sub.html": [
-    [
-     "/security/window-name-after-same-origin-sub-frame-navigation.sub.html",
-     {}
-    ]
-   ],
    "selection/Document-open.html": [
     [
      "/selection/Document-open.html",
@@ -350899,12 +350449,6 @@
      {}
     ]
    ],
-   "service-workers/service-worker/request-body-blob.https.html": [
-    [
-     "/service-workers/service-worker/request-body-blob.https.html",
-     {}
-    ]
-   ],
    "service-workers/service-worker/request-end-to-end.https.html": [
     [
      "/service-workers/service-worker/request-end-to-end.https.html",
@@ -353309,75 +352853,81 @@
      {}
     ]
    ],
-   "viewport/viewport-no-resize-event-on-overflow-recalc.html": [
+   "visual-viewport/viewport-no-resize-event-on-overflow-recalc.html": [
+    [
+     "/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html",
+     {}
+    ]
+   ],
+   "visual-viewport/viewport-read-size-causes-layout.html": [
     [
-     "/viewport/viewport-no-resize-event-on-overflow-recalc.html",
+     "/visual-viewport/viewport-read-size-causes-layout.html",
      {}
     ]
    ],
-   "viewport/viewport-read-size-causes-layout.html": [
+   "visual-viewport/viewport-read-size-in-iframe-causes-layout.html": [
     [
-     "/viewport/viewport-read-size-causes-layout.html",
+     "/visual-viewport/viewport-read-size-in-iframe-causes-layout.html",
      {}
     ]
    ],
-   "viewport/viewport-read-size-in-iframe-causes-layout.html": [
+   "visual-viewport/viewport-resize-event-on-load-overflowing-page.html": [
     [
-     "/viewport/viewport-read-size-in-iframe-causes-layout.html",
+     "/visual-viewport/viewport-resize-event-on-load-overflowing-page.html",
      {}
     ]
    ],
-   "viewport/viewport-resize-event-on-load-overflowing-page.html": [
+   "visual-viewport/viewport-scrollbars-cause-resize.html": [
     [
-     "/viewport/viewport-resize-event-on-load-overflowing-page.html",
+     "/visual-viewport/viewport-scrollbars-cause-resize.html",
      {}
     ]
    ],
-   "viewport/viewport-scrollbars-cause-resize.html": [
+   "visual-viewport/viewport-type.html": [
     [
-     "/viewport/viewport-scrollbars-cause-resize.html",
+     "/visual-viewport/viewport-type.html",
      {}
     ]
    ],
-   "viewport/viewport-type.html": [
+   "visual-viewport/viewport-unscaled-scale-iframe.html": [
     [
-     "/viewport/viewport-type.html",
+     "/visual-viewport/viewport-unscaled-scale-iframe.html",
      {}
     ]
    ],
-   "viewport/viewport-unscaled-scale-iframe.html": [
+   "visual-viewport/viewport-unscaled-scale.html": [
     [
-     "/viewport/viewport-unscaled-scale-iframe.html",
+     "/visual-viewport/viewport-unscaled-scale.html",
      {}
     ]
    ],
-   "viewport/viewport-unscaled-scale.html": [
+   "visual-viewport/viewport-unscaled-scroll-iframe.html": [
     [
-     "/viewport/viewport-unscaled-scale.html",
+     "/visual-viewport/viewport-unscaled-scroll-iframe.html",
      {}
     ]
    ],
-   "viewport/viewport-unscaled-scroll-iframe.html": [
+   "visual-viewport/viewport-unscaled-scroll.html": [
     [
-     "/viewport/viewport-unscaled-scroll-iframe.html",
+     "/visual-viewport/viewport-unscaled-scroll.html",
      {}
     ]
    ],
-   "viewport/viewport-unscaled-scroll.html": [
+   "visual-viewport/viewport-unscaled-size-iframe.html": [
     [
-     "/viewport/viewport-unscaled-scroll.html",
+     "/visual-viewport/viewport-unscaled-size-iframe.html",
      {}
     ]
    ],
-   "viewport/viewport-unscaled-size-iframe.html": [
+   "visual-viewport/viewport-unscaled-size.html": [
     [
-     "/viewport/viewport-unscaled-size-iframe.html",
+     "/visual-viewport/viewport-unscaled-size.html",
      {}
     ]
    ],
-   "viewport/viewport-unscaled-size.html": [
+   "wake-lock/interfaces.https.html": [
     [
-     "/viewport/viewport-unscaled-size.html",
+     "/wake-lock/interfaces.https.html",
      {}
     ]
    ],
@@ -353873,6 +353423,24 @@
      {}
     ]
    ],
+   "webaudio/chrome/the-constantsourcenode-interface/constant-source-basic.html": [
+    [
+     "/webaudio/chrome/the-constantsourcenode-interface/constant-source-basic.html",
+     {}
+    ]
+   ],
+   "webaudio/chrome/the-constantsourcenode-interface/constant-source-onended.html": [
+    [
+     "/webaudio/chrome/the-constantsourcenode-interface/constant-source-onended.html",
+     {}
+    ]
+   ],
+   "webaudio/chrome/the-constantsourcenode-interface/constant-source-output.html": [
+    [
+     "/webaudio/chrome/the-constantsourcenode-interface/constant-source-output.html",
+     {}
+    ]
+   ],
    "webaudio/historical.html": [
     [
      "/webaudio/historical.html",
@@ -358139,6 +357707,12 @@
      {}
     ]
    ],
+   "webmessaging/Channel_postMessage_Blob.htm": [
+    [
+     "/webmessaging/Channel_postMessage_Blob.htm",
+     {}
+    ]
+   ],
    "webmessaging/Channel_postMessage_DataCloneErr.htm": [
     [
      "/webmessaging/Channel_postMessage_DataCloneErr.htm",
@@ -359011,6 +358585,12 @@
      {}
     ]
    ],
+   "webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html": [
+    [
+     "/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html",
+     {}
+    ]
+   ],
    "webrtc/RTCPeerConnection-setRemoteDescription.html": [
     [
      "/webrtc/RTCPeerConnection-setRemoteDescription.html",
@@ -359161,9 +358741,9 @@
      {}
     ]
    ],
-   "webrtc/interfaces.html": [
+   "webrtc/interfaces.https.html": [
     [
-     "/webrtc/interfaces.html",
+     "/webrtc/interfaces.https.html",
      {}
     ]
    ],
@@ -362785,12 +362365,24 @@
      {}
     ]
    ],
+   "worklets/animation-worklet-referrer.html": [
+    [
+     "/worklets/animation-worklet-referrer.html",
+     {}
+    ]
+   ],
    "worklets/paint-worklet-import.html": [
     [
      "/worklets/paint-worklet-import.html",
      {}
     ]
    ],
+   "worklets/paint-worklet-referrer.html": [
+    [
+     "/worklets/paint-worklet-referrer.html",
+     {}
+    ]
+   ],
    "x-frame-options/deny.sub.html": [
     [
      "/x-frame-options/deny.sub.html",
@@ -382071,6 +381663,18 @@
      {}
     ]
    ],
+   "css/css-fonts-3/font-variant-position-02.html": [
+    [
+     "/css/css-fonts-3/font-variant-position-02.html",
+     {}
+    ]
+   ],
+   "css/css-fonts-3/font-variant-position-03.html": [
+    [
+     "/css/css-fonts-3/font-variant-position-03.html",
+     {}
+    ]
+   ],
    "css/css-fonts-3/language-specific-01.html": [
     [
      "/css/css-fonts-3/language-specific-01.html",
@@ -383067,12 +382671,6 @@
      {}
     ]
    ],
-   "css/css3-color/t44-currentcolor-inherited-c.xht": [
-    [
-     "/css/css3-color/t44-currentcolor-inherited-c.xht",
-     {}
-    ]
-   ],
    "css/css3-color/t451-system-colors-a.xht": [
     [
      "/css/css3-color/t451-system-colors-a.xht",
@@ -383385,7 +382983,7 @@
    "support"
   ],
   "./.travis.yml": [
-   "1e5af7c585f3789659d7a614cfbed060f763f3ad",
+   "54adee7fb83a554a18793883baf382a3ec534f62",
    "support"
   ],
   "./CONTRIBUTING.md": [
@@ -383413,7 +383011,7 @@
    "support"
   ],
   "./lint.whitelist": [
-   "f23ed9721b92ce719c42f53e682eb774743a0643",
+   "c6d3de79e373520c12e55fc71d1bc556dade9569",
    "support"
   ],
   "./serve.py": [
@@ -387904,6 +387502,10 @@
    "03f52693e44c77add3d3be21b0e9232425b750b2",
    "testharness"
   ],
+  "IndexedDB/idbcursor-request-source.html": [
+   "98bcafdf7facb08f0a10ae23cfee0c547d689328",
+   "testharness"
+  ],
   "IndexedDB/idbcursor-reused.htm": [
    "2462c58f442407b1168751cc447076dc39e3c1ee",
    "testharness"
@@ -388408,6 +388010,10 @@
    "9d994ad6a23181b113947e5714ddbe3592619540",
    "testharness"
   ],
+  "IndexedDB/idbindex-request-source.html": [
+   "0101dd82175ea14b0b887d645b13c0e76166e33b",
+   "testharness"
+  ],
   "IndexedDB/idbindex_count.htm": [
    "2e44015e473ef424160ebef828a4e1925cf1b480",
    "testharness"
@@ -388584,6 +388190,10 @@
    "7b276a866c669890d42b47a66ad5111e32e3d1f9",
    "testharness"
   ],
+  "IndexedDB/idbobjectstore-request-source.html": [
+   "9fb6d377349ba0919572d9725e2a98772fc66b9a",
+   "testharness"
+  ],
   "IndexedDB/idbobjectstore-transaction-SameObject.html": [
    "f8fe684bf65950e534b269413620339819191abb",
    "testharness"
@@ -391689,7 +391299,7 @@
    "testharness"
   ],
   "accelerometer/Accelerometer_insecure_context.html": [
-   "62c0fdfe1ee0752956b4c68e877cd7f47ac887a1",
+   "da374eab5cbc963d8e5e2f2025d9fb1a94043643",
    "testharness"
   ],
   "accelerometer/Accelerometer_onerror-manual.https.html": [
@@ -391701,15 +391311,131 @@
    "support"
   ],
   "accelerometer/idlharness.https.html": [
-   "a4b5c164268d6742e7da504d15d6b9eeb4cfc6ce",
+   "27d8177856ad17d372df7f099214df5a8b65fee8",
    "testharness"
   ],
+  "acid/README.md": [
+   "76f4f73365670ecc3f97c560141a280a52b46807",
+   "support"
+  ],
+  "acid/acid2/404.html": [
+   "34bc78baab77c60aa684ee6813aa86249800eb3b",
+   "support"
+  ],
+  "acid/acid2/reference.html": [
+   "61b1dcb8c4675c97727c2ffc1780e2eb5c068dd6",
+   "support"
+  ],
+  "acid/acid2/reference.png": [
+   "696764f4391c13a6708d4fe5f23923a6896fd942",
+   "support"
+  ],
+  "acid/acid2/reftest.html": [
+   "1ba7784734de3cdef01a60fbe2bdaf604b368fca",
+   "reftest"
+  ],
+  "acid/acid2/test.html": [
+   "90dbe7051d6b95cb21e1e1e770a025f8e3aac7fe",
+   "support"
+  ],
+  "acid/acid3/empty.css": [
+   "2f6e2814f959b06142ba957b90f4001b5329c3b1",
+   "support"
+  ],
+  "acid/acid3/empty.css.headers": [
+   "41e260e7df49e0e4ddb1fc5df11913dbda15edd7",
+   "support"
+  ],
+  "acid/acid3/empty.html": [
+   "6fd8f696ff136a0a1122a9e492583e18704c2c73",
+   "support"
+  ],
+  "acid/acid3/empty.png": [
+   "670ad8af8896cc966d44bdf8bd943b04e9d2a5b3",
+   "support"
+  ],
+  "acid/acid3/empty.txt": [
+   "96a0d315fb0f04f8de929e81a02c71c411e7132b",
+   "support"
+  ],
+  "acid/acid3/empty.xml": [
+   "66e1301c2bd8ba5281f6ffddf8bfa69877c73bd6",
+   "support"
+  ],
+  "acid/acid3/empty.xml.headers": [
+   "0bd5f6529278b256fbf88df3b8ff4e196f254152",
+   "support"
+  ],
+  "acid/acid3/favicon.ico": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "acid/acid3/favicon.ico.headers": [
+   "2c51b95bd2032c76dcc7a1c54e197756159a7e4b",
+   "support"
+  ],
+  "acid/acid3/reference.png": [
+   "2bd47f247ce1328013d2ade5c7e4b5b03f5a0eda",
+   "support"
+  ],
+  "acid/acid3/reference.sub.html": [
+   "764c07c1072c831cb69719372aca734fa49d827a",
+   "support"
+  ],
+  "acid/acid3/support-a.png": [
+   "036a26be37f2ecd1ee92ffc580a02390af99a660",
+   "support"
+  ],
+  "acid/acid3/support-b.png": [
+   "4772d37737a3379db3fae1faf13aeaa272c7e8b3",
+   "support"
+  ],
+  "acid/acid3/support-b.png.headers": [
+   "eace94f752c631a4785b9e1f52fa6f298b8924e0",
+   "support"
+  ],
+  "acid/acid3/svg.xml": [
+   "bd09818b36af3acdc711836b7163c7f79f4db349",
+   "support"
+  ],
+  "acid/acid3/svg.xml.headers": [
+   "700fd6e4cb3f0c4069d02e09bcead4206fe9ca67",
+   "support"
+  ],
+  "acid/acid3/test.html": [
+   "1822fb86b9af47dd384398e56afb6d8ed2f0565b",
+   "reftest"
+  ],
+  "acid/acid3/xhtml.1": [
+   "2bd66b61cf28d08ddd4a262785b953b6a5f9982c",
+   "support"
+  ],
+  "acid/acid3/xhtml.1.headers": [
+   "889fd09853f091aba8fea3b45cfeb36437be1c2b",
+   "support"
+  ],
+  "acid/acid3/xhtml.2": [
+   "15a61290a2a1ea306de755501d820815f4a45a88",
+   "support"
+  ],
+  "acid/acid3/xhtml.2.headers": [
+   "889fd09853f091aba8fea3b45cfeb36437be1c2b",
+   "support"
+  ],
+  "acid/acid3/xhtml.3": [
+   "a3ede89b3b94bc5c02c39bb0c26075a5a2bf6396",
+   "support"
+  ],
+  "acid/acid3/xhtml.3.headers": [
+   "889fd09853f091aba8fea3b45cfeb36437be1c2b",
+   "support"
+  ],
   "ambient-light/AmbientLightSensor.https.html": [
    "86a1f84e2e034d58b2a7f6fc01880028b444c7cd",
    "testharness"
   ],
   "ambient-light/AmbientLightSensor_insecure_context.html": [
-   "9267bca8016bdde90ba2e5e866e9989db7c045dd",
+   "f6d9e5bd6d1ce6705835f15498ddbb5a5b82fb88",
    "testharness"
   ],
   "ambient-light/AmbientLightSensor_onerror-manual.https.html": [
@@ -391721,7 +391447,7 @@
    "support"
   ],
   "ambient-light/idlharness.https.html": [
-   "f48a58b450fa15e820bef6d9c6f5dac834d8d6fb",
+   "e28ad30d7611438c7b3e884ef4160cf3a096ea85",
    "testharness"
   ],
   "annotation-model/.editorconfig": [
@@ -393777,7 +393503,7 @@
    "testharness"
   ],
   "background-fetch/mixed-content-and-allowed-schemes.https.window.js": [
-   "13873d861416a40d831026a88f864f13a9447c7f",
+   "a285388a7d275f50444079b9549797ed29b27fd3",
    "testharness"
   ],
   "background-fetch/port-blocking.https.window.js": [
@@ -411968,1220 +411694,160 @@
    "19d2027dc8784a479722b7f405fee31973808e2f",
    "testharness"
   ],
-  "content-security-policy/blink-contrib-2/allowed.css": [
-   "4477032f6a7347c932c71f9737f3f5e8d244c7d3",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/base-uri-allow.sub.html": [
-   "8a557e111738324c510f48e1a2030933caa33087",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/base-uri-allow.sub.html.sub.headers": [
-   "6205a5bbb5290f29b462bfe2395450ac31772550",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/base-uri-deny.sub.html": [
-   "b9661979aa2ffda1bb4923bef096962ad632c6e3",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/base-uri-deny.sub.html.sub.headers": [
-   "ccfc66c70082010f33917cc245fbc30affc46798",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html": [
-   "83ebd7d64b5746989f8bdd9c5103ffc11aa93f36",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html.sub.headers": [
-   "c74c11f68173073c6759d3a170c0684920078f95",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html": [
-   "757d2535beddbac6fdd8efaa5d0cb84afaf28235",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html.sub.headers": [
-   "7222d1f514ab8f7f7bff52bab4a190f95bc20315",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html": [
-   "840c122d2a7063848064402c7d76f2d65abfde39",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html.sub.headers": [
-   "525c9c57c7e2f0bfc15cf7c5af7b32db5eba125b",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html": [
-   "cc54ab08c93d54539891369e9ff1b293c3365286",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html.sub.headers": [
-   "546dc51d2d91e73b3cb23c8d995fedaadc16a628",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html": [
-   "ad6e0052bde40225c42d044301a860433d572fe2",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html.sub.headers": [
-   "5e34b41789ee898312b915dcd2f4ed3f03085dca",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html": [
-   "cf1d1a761cd6119698d44a10e42e79bd4a476707",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html.sub.headers": [
-   "3dc9196bfb5e76f30e4b7585f74c73ad6d6ebca8",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html": [
-   "51a8da18c3e10220c8080ea33e10e7d7d8abcb07",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html.sub.headers": [
-   "3a3b24785f4fea78703818933b0476896e959545",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/meta-outside-head.sub.html": [
-   "68f74fa0c400ca45ddf0281d373da2630f03b8f2",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/meta-outside-head.sub.html.sub.headers": [
-   "3693f04b4221fac51e2074e5ab29d09394fe3b43",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/metaHelper.js": [
-   "ff614bd9c4e37c02c8027c6b38fc615c0ade6883",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html": [
-   "898041d9b67c26e17e346b76c5d74eb7f1aa84a9",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html.sub.headers": [
-   "670e8a07d47244eb5cc339ffbd84c21f64116370",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html": [
-   "2013babc6dd58142e92c57df92f0435035bf1ed1",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html.sub.headers": [
-   "dda5601b7a82a0c74c72546211b6342a6a1649c1",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html": [
-   "c63a410659d4e310c49c7d801164631d0182df67",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html.sub.headers": [
-   "c57954b107555b24a8533c9761e325804b0a361a",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html": [
-   "a41d08e25b47576b9cfdcf4fcc455cb08c2fbf34",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html.sub.headers": [
-   "4689f895bf0571659932e078ae5c515b206dbb50",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html": [
-   "75d812278e01f876069ccf40ad2e8d776cfe0ddf",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html.sub.headers": [
-   "23cd8eaa18002d63739cedfb7fae8e609d74df4f",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html": [
-   "519c94f700d87a69dc9c89ce5670112a5024cd61",
+  "content-security-policy/blob/blob-urls-do-not-match-self.sub.html": [
+   "8fb0231ccaff9062464119096a4ae89c04216b42",
    "testharness"
   ],
-  "content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html.sub.headers": [
-   "c5f88b1987a74cad08d716600963b572786684ea",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html": [
-   "f37a26072dda19784f9a8b1a5cd19908641addb4",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html.sub.headers": [
-   "489ccab66c926e96b8d8e63fc570bbcbc9be914d",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/scripthash-allowed.sub.html": [
-   "504d8fcd9a506bc26ec62f4013be4c932b51b7be",
+  "content-security-policy/blob/blob-urls-match-blob.sub.html": [
+   "ed1190f47cbdc174364d1e40b842acc0b2320b0a",
    "testharness"
   ],
-  "content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers": [
-   "efa78236077151c9db3131dc4012d313be14d2cf",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html": [
-   "60327c2ed7fafd20d6856c64a58d5a45f57edd59",
+  "content-security-policy/blob/self-doesnt-match-blob.sub.html": [
+   "ecf7854c6d8a895cde255d3eb27316f22473373a",
    "testharness"
   ],
-  "content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html.sub.headers": [
-   "bd797393705ef8e94c38d3901c9875b17a12cda7",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/scripthash-default-src.sub.html": [
-   "f68fd0d2c9f32ac979b89c74262c09d2ff350052",
+  "content-security-policy/blob/star-doesnt-match-blob.sub.html": [
+   "6b0e38bd3eecc061772515d651386a155a0905fe",
    "testharness"
   ],
-  "content-security-policy/blink-contrib-2/scripthash-default-src.sub.html.sub.headers": [
-   "fbd7e70e5242a6e9dc49392ee3ac94b07a809f12",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html": [
-   "4c820472cd10c61bc4ee2b4fcd3f7166bc4eed63",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html.sub.headers": [
-   "d2653014b0a2ef8fa8ac48f487ac0190b0322491",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html": [
-   "19e9ba394da26e22112d5259da9f687e15dad71d",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers": [
-   "2846f1df6ad40681e3da12e73cc835211787368a",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html": [
-   "db7030d465c87d5820389ddefb43e5023e5d3f22",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html.sub.headers": [
-   "8b1cea5e0795626976e9fb99b1207d91125006f7",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html": [
-   "727b7acbfdec17f3740bfdc86df33a8bcb608a10",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html.sub.headers": [
-   "ebf7b1a5fb3f003f86977876a163715a01c3627b",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html": [
-   "768b314d977b5b23af218b7a004502d3c444938b",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html.sub.headers": [
-   "6dac27cec2673d7b8c0f4c8cbc37b502469c143d",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html": [
-   "fa1c716c2e68cbc805796d7ec223fe84a51978c9",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html.sub.headers": [
-   "5eb2dece8f120e0db6980bc26e6b6c9bc9d46e7a",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html": [
-   "30befb75a19b8111c23a97ce7f4f60db4d24d493",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html.sub.headers": [
-   "10f81ddd4bf6cd9a3d9c47f686162cd8d68b8aea",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html": [
-   "f9dd2b59f8dbdd8ba9eb60265e10cf095a1fb147",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html.sub.headers": [
-   "93fc40dfbce27b0aeefcad22a111ad060fd696e4",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html": [
-   "d2d4c75e332b4e64314572aa64fa173463a9f017",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html.sub.headers": [
-   "b0f6577c04f6ed4fcdb502353d1d54ed9bfc8cb7",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html": [
-   "40170584f1f4e64dde81a6223a60b73d8e8d03ad",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html.sub.headers": [
-   "992e5a67c57e895c77f4dd792c2a6d1e5eea541c",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html": [
-   "3ea03b1451627610c5efc7cad3917d6872a0fae1",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html.sub.headers": [
-   "1cc03dde82f7d1526d65b30528252e5b796ae511",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/stylehash-allowed.sub.html": [
-   "5e13fc8c91c0226bf65acb509f8bb8df5a5ba4a5",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.sub.headers": [
-   "061e9277db484d4f644e4accef00192c9efcdc33",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html": [
-   "c19d049605cefc84354daaf26226d97549fd1c62",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html.sub.headers": [
-   "f81ca255119107540a3f21637ea33c808d084bdd",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/stylehash-default-src.sub.html": [
-   "5fe5655682b353ff9b708cf25d5b2b789e2060df",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/stylehash-default-src.sub.html.sub.headers": [
-   "2570aa3a9ca93ae4229ab94b7db01e8c15c54dea",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html": [
-   "248fe8cfb2653de13b284856d45b64ecaeaf05c7",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html.sub.headers": [
-   "a8709c0fe8a6157a8c5b8f204b2e2c2dc5d54d94",
-   "support"
-  ],
-  "content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html": [
-   "b3818c2571c2842eb41e592972787ea6253e1cda",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html.sub.headers": [
-   "4853d89a7fd9a143088489503a6fd40597aaa048",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html": [
-   "24c5d49b3581311e5fc1ecb571bc5954986caf8c",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html.sub.headers": [
-   "102b595589378313916db4d8ee8deffed78de386",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/blob-urls-match-blob.sub.html": [
-   "bfa1efe4f4781b85f170645fa5a85cc65c42b085",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/blob-urls-match-blob.sub.html.sub.headers": [
-   "cc3a099cb7177060f656b543de60beecd469f378",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html": [
-   "d92daf8146437e2d95bd8179b9b868dc67c59385",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html.sub.headers": [
-   "f2603d3d846366364be454c45fb2b81b1be6ac67",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/combine-multiple-header-policies.html.asis": [
-   "6ff2a399547ec42c3e7e0eae7096fb4987ccaa14",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html": [
-   "85d842357335ecd60168eabac0f43ff9febfcc6a",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html.sub.headers": [
-   "0f8ec34cff2a3a5bf3587c476b31938ddc046c2a",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html": [
-   "5f55cfa4f5495b4f9b27ca5e900faa42048864c7",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html.sub.headers": [
-   "813cd9544dc5666f87112e7da1ae3a36a291271d",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html": [
-   "8e55b1117a947edfafdc6ffaa1670ebafd536066",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html.sub.headers": [
-   "28e08f4f4251ee5a9fcc9594cecc70bd14060228",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html": [
-   "7b3f0331c46f70747f957e280083d309003e437f",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html.sub.headers": [
-   "ec13e2fdc5fb56dc3dee8a0995719d96a4bba405",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html": [
-   "821efa8a9a464068112eedceab309bd6c775910a",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html.sub.headers": [
-   "21f6758a1b449188bb2adfe948018c5b0a7bf064",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html": [
-   "f54d3fd58c36d4424168ff29556d888314b58fcb",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html.sub.headers": [
-   "294a04ecb2f88b1a0d27b52066736b263379ece4",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html": [
-   "a83fb905d187a31c088241a12764f2c5aa3ae831",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html.sub.headers": [
-   "b28a1e116ffca21860a6c86a0fd82d2ce2a0d3f3",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html": [
-   "178a2db4e5ca568b277d112334aff2602b037d68",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html.sub.headers": [
-   "a1053d5f59cb43aa04827e67fc8b905fdf3ab650",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html": [
-   "4297111d8a845cdf03360b0ec11c30b156e89491",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html.sub.headers": [
-   "325045d838e6ff7cb6e3f5631bc07d908bdab11f",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html": [
-   "2c2433996296ffe187d68530fdc6d68788c3a3f4",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html.sub.headers": [
-   "54fcb5239bf6142d0f7e49d892eb31a1a8de2247",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html": [
-   "e47c7d9becb9a1684a6691c69ebe2becd1716919",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.sub.headers": [
-   "c163d71619fd06a3d73fe20ab90cb8f9438ac4e1",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/default-src-inline-allowed.sub.html": [
-   "f46a2203104183e875ff951e00dcd23a35a8f3f4",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/default-src-inline-allowed.sub.html.sub.headers": [
-   "14f88f9af278c73a82d65c1a9672dfba68b56f33",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/default-src-inline-blocked.sub.html": [
-   "b3252eacf28189f2ecc0722000c329e0e36a2c30",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/default-src-inline-blocked.sub.html.sub.headers": [
-   "eb81acca81e2785a5fda4c415668c6701472b111",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/duplicate-directive.sub.html": [
-   "aa6f1ae3a705c2aa8f0d89a1837964b68ff4fd98",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/duplicate-directive.sub.html.sub.headers": [
-   "3545a979a8c0616c6ca51c310787ee8962e62d52",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/eval-allowed.sub.html": [
-   "a08c6e53cd847d2b196de9689de194d84a7d6808",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/eval-allowed.sub.html.sub.headers": [
-   "62c0917fb937946cacd3e57b72178fd0fe1a1b48",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html": [
-   "abe7966831e16489f9e055a8d7ea7bf3426c1bdd",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html.sub.headers": [
-   "7e3372b1a4d99483c5e7270e60dfa5a63743a2e9",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html": [
-   "f0abdbd1904ed3bf999140fa7e945d65c7de8cc9",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html.sub.headers": [
-   "2639828fc734a229e94f624db55dce1dad78a738",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/eval-blocked.sub.html": [
-   "df5c83f290327658fc4ed01e8a0298409af87d5f",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/eval-blocked.sub.html.sub.headers": [
-   "10a3b9f5e926f5f24dc9dbac58e881b16279d02e",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html": [
-   "80aa58cf370623245fc81f607d6788410def2035",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html.sub.headers": [
-   "179a7fad9090c3a4cee7dc0663864f75bd56e5e1",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html": [
-   "f9d5f72018bea3569fbee2187ef0087fc7b019f8",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html.sub.headers": [
-   "730a7c9e70ba80203d6ec1a4987b2d635c6dcdd3",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html": [
-   "30e88830998f0a5519c0092dcd4b61eb815b180f",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html.sub.headers": [
-   "64dd67576b23144bd94b0d6f10de9b0d70068b5c",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html": [
-   "0bcd585a7ea4cd2521d4462579766dfe4c346d22",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html.sub.headers": [
-   "f1271aaed9988929e1ce84e5ee3a92be0d6279fa",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html": [
-   "a63e65f32c0e703f1a012da6f6743948b118bd7e",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html.sub.headers": [
-   "4825d6a31d28f76dec815089ef7ca470515690b2",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html": [
-   "9680e354c42e579be95716e0b14981cb0ce2914b",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html.sub.headers": [
-   "055354047a28465a85243b96a7496e2c9f18133c",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html": [
-   "af2613be64e555706774100db1684d6403960741",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html.sub.headers": [
-   "5b7a4395122e2b71eeb3fb102a09eeddf5a18207",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html": [
-   "51e485a3618cfd5901eedc8ef4a82a6e92f6b3c7",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html.sub.headers": [
-   "8197c90f60c1be3904f2959b894c7e3633ed613a",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/frame-src-allowed.sub.html": [
-   "9741e0aa95e1769427f49956fcaaeb09491d053e",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/frame-src-allowed.sub.html.sub.headers": [
-   "23043a49f48b67cedbd02f3558935f86f935bd02",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/frame-src-blocked.sub.html": [
-   "deb6fb388cef5a43a5e6c409fce2223cbc90e71a",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/frame-src-blocked.sub.html.sub.headers": [
-   "5f032c02128b6f0343161eee6727393719e467e4",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html": [
-   "7b83244696dd971872c64b135638cddd00d662f5",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html.sub.headers": [
-   "1ee2ef92b2f77485862e3e79d9a32d489edbf992",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/function-constructor-allowed.sub.html": [
-   "10232e7325a194daec21704022a2954f37011bac",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/function-constructor-allowed.sub.html.sub.headers": [
-   "ba914f7cb6147b068218ea5c7793e3af823e130c",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/function-constructor-blocked.sub.html": [
-   "5b564654f8bf198bfc12aff6aa8980d7337dd8fb",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/function-constructor-blocked.sub.html.sub.headers": [
-   "8475eb49eeecd0869f5065083164642c7c2d8957",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/icon-allowed.sub.html": [
-   "2cb38da88b77339f6d4b8dae71ce1379349a90b4",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/icon-allowed.sub.html.sub.headers": [
-   "2c8be4fa14cd1df33d7fc0aee621bc702c9cdb1e",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/icon-blocked.sub.html": [
-   "80c5296a3091d56f655280b2ade55d841cf5dc7d",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/icon-blocked.sub.html.sub.headers": [
-   "b97148dfba843d1a9f2230660647a73f6c56708f",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/iframe-inside-csp.sub.html": [
-   "fb56541d51e38ec0e9d3a5c8c374292c25c6e0c6",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/iframe-inside-csp.sub.html.sub.headers": [
-   "5389749903edb42152560eda2c1108496da7c428",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/image-allowed.sub.html": [
-   "ec80b700f1add010d31619c4e2e6db92694dbde4",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/image-allowed.sub.html.sub.headers": [
-   "fa9826115d5cd10837e86f8655032ca0e8dd08bb",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/image-blocked.sub.html": [
-   "c4b8906a19de0cf2b6a87de1d27a623752cff028",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/image-blocked.sub.html.sub.headers": [
-   "ae212fe4eef305ad278165bd1857dce51ac7b500",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html": [
-   "0ef428649d2af808395ae4ef8873bb67fa5494a3",
+  "content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html": [
+   "aaaca916f886f938cba52da4763b49a82f2b6ef8",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html.sub.headers": [
-   "08eb1c33eb15ff0fd49d5a5d6f21059661d702ac",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html": [
-   "502c1a0ec24188bc9ac057fc0649cfaf9df2c586",
+  "content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html": [
+   "f1b9578036a258488f81a8301b54063feb56d8f0",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers": [
-   "d339bfe0f34c6681a9a87cc3e000915cd134e7df",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html": [
-   "f081e97f85d1f508a93387e1a6a13fdb8f1ac8af",
+  "content-security-policy/child-src/child-src-allowed.sub.html": [
+   "d1771ab8136386cee64c7f2d83a24b6d797f55f8",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html.sub.headers": [
-   "3231642fae43bbd17c95144c5300c12e7b0dbcbf",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html": [
-   "6d1e44e38d455d808f84e8c768ee2e9463a93394",
+  "content-security-policy/child-src/child-src-blocked.sub.html": [
+   "0441b79da3a4e318b2c20f7b8f89b705dec7804f",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html.sub.headers": [
-   "2d9e07d1abb825b2e9cd007fd654ad0813ed585b",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html": [
-   "42a173324a8ac47b6d503af816f761e99ad4f63c",
+  "content-security-policy/child-src/child-src-conflicting-frame-src.sub.html": [
+   "dfc2e12a25932ba08753c6a960c731e144a0ae12",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html.sub.headers": [
-   "1636468fc51e25aea5ce89e74cda44aec4904b50",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html": [
-   "10859486137819559e70f93d9ca14b140a31f268",
+  "content-security-policy/child-src/child-src-cross-origin-load.sub.html": [
+   "5e35ab6c4a3384f87d23cfaab6a66ecfdf7dc862",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html.sub.headers": [
-   "ece1760314594ba10069b299c898886fa4d2dca7",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/inline-style-allowed.sub.html": [
-   "4274e277aca415ab8afc2984adbdbcf41b8fbea5",
+  "content-security-policy/child-src/child-src-redirect-blocked.sub.html": [
+   "97f865df60cc22c3d7ee1888db7dc20be2a7e81a",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/inline-style-allowed.sub.html.sub.headers": [
-   "7cc5d2f15268e4ac5e42c325ca8c8d013c3172e6",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html": [
-   "654705464184d21c8b3104e5a656b999980e28ca",
+  "content-security-policy/child-src/child-src-worker-allowed.sub.html": [
+   "da18b70d2f859c83f1599e5f65bfeb67d1183ee4",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html.sub.headers": [
-   "7b151b5019f9a42f5490dfcd8762b169df93568f",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html": [
-   "08bee8596d1b46fb846e2585526365d406b9e443",
+  "content-security-policy/child-src/child-src-worker-blocked.sub.html": [
+   "16fc87d40c7466de1b59674abc4510c29c7d8cd2",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html.sub.headers": [
-   "414ccf7b1fb81533b18d1761568c2b29a3374d05",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html": [
-   "6bab2dd936f4f0c10d55e5c2c0d77472fae0b962",
+  "content-security-policy/connect-src/connect-src-beacon-allowed.sub.html": [
+   "7970e661ec27a69268f189df30f8fbd3e4574f4a",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html.sub.headers": [
-   "1491c2deb8c9b434abac7b7477d8342d8d4bc680",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/inline-style-blocked.sub.html": [
-   "05051ca8f016b16bbd24ae685ea2ce05be0fa9cc",
+  "content-security-policy/connect-src/connect-src-beacon-blocked.sub.html": [
+   "c9a67e2b0e68c79f95d825552be71452a7786b5d",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/inline-style-blocked.sub.html.sub.headers": [
-   "d847dfa9fec3763edd4b8d1e0394e5c991d37524",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/manifest-src-allowed.sub.html.sub.headers": [
-   "b8aecfde2a75b6c0a0475e39c38f0802df07b503",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/manifest-src-blocked.sub.html.sub.headers": [
-   "903f086b16a9f45d27a6b92345473e1e139b241c",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/media-src-allowed.sub.html": [
-   "9b89b4247c6142c8c2d0a998c347af3953a25cc6",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/media-src-allowed.sub.html.sub.headers": [
-   "815fb25ca6f00b72fefd852f54553246a06fa703",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/media-src-blocked.sub.html": [
-   "da8fb3f95a9cd0290955c0f3d5c6ba16734960df",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/media-src-blocked.sub.html.sub.headers": [
-   "8b7e86e63aab33e88135232b750b2aa14c1dd5b1",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/media-src-track-block.sub.html": [
-   "eced9662b2c78da18fcf9b5d6f2a152b0c08d0ce",
+  "content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html": [
+   "a264a2a9ff354c8ee4b938e1c1450f0386bfca4e",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/media-src-track-block.sub.html.sub.headers": [
-   "bb009d5c24ca8378c2507d11bff795b051314b6f",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html": [
-   "b190bbe16893d13d25599c2cbb344efc3f61eca8",
+  "content-security-policy/connect-src/connect-src-eventsource-allowed.sub.html": [
+   "c81ac8cb24d0865cf4a542f5cb4543cf142e5b91",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html.sub.headers": [
-   "368845671fc996d39fd6f85c113a26cdaa98ee3e",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html": [
-   "e4cd8d8e7a3150626eea1d6ca7beed13feb6a76c",
+  "content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html": [
+   "bf1ea083a5d5759d2e534d303ab77de143269d72",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html.sub.headers": [
-   "45d7467bb741dc0c79dce502b805a5bbd1e9be87",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html": [
-   "d65c0b5836b2de7a08fb0449bb14ddba96cde393",
+  "content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html": [
+   "b9686b701881c5f21a96b69220a7f5a9b5bc9245",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html.sub.headers": [
-   "e44638c408b443834917aff02b682e60173c8e86",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/object-src-url-allowed.sub.html": [
-   "3c438e241bf7aaf9bf9b5a0822b86aa53ade410e",
+  "content-security-policy/connect-src/connect-src-websocket-allowed.sub.html": [
+   "5a6577c1b848b0615a3e7581f53501eedf521d94",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/object-src-url-allowed.sub.html.sub.headers": [
-   "6446f7e9da139fc9767b98f8c386df2d258b904d",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/object-src-url-blocked.sub.html": [
-   "46091ded84a3ac6f351748082ede8a794f8eda6a",
+  "content-security-policy/connect-src/connect-src-websocket-blocked.sub.html": [
+   "43a867fca7a3e067dcd9ca38a334d97707ebfa42",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/object-src-url-blocked.sub.html.sub.headers": [
-   "7b7b534814bc7e37b9ff9fd9690b279abb311e83",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html": [
-   "f4d819fa1c0ec1e24b0e74a3950c263c76468cfe",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html.sub.headers": [
-   "cb53654fa55c4a9446505ffb1a0a8da7888c6f79",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/report-blocked-data-uri.sub.html": [
-   "c56334c6f75ed43062a9cc08fab6526dcdcff80e",
+  "content-security-policy/connect-src/connect-src-xmlhttprequest-allowed.sub.html": [
+   "0be3adbd14e0188a5f2c4211b4b4726beee03bf9",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/report-blocked-data-uri.sub.html.sub.headers": [
-   "120a5c71801a9fa9f7d18a34f03c0bfd6026f845",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html": [
-   "90fe967c355bb45e66d4820c36412baf7826ffd0",
+  "content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html": [
+   "eef23d6c5a7bb3e40cf676bc04c37c2d5d88ba63",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html.sub.headers": [
-   "1323d5389e2fe4b68f885dba863e1a21983bbd30",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html": [
-   "ba1cf4795b8b4f315e8b4332fbba794f7cc3ffcb",
+  "content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html": [
+   "892d95d65e8aeb5ca483be7ddab20574cbb94871",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html.sub.headers": [
-   "a89139c890834d9337f31b93589bed9f34cf2841",
+  "content-security-policy/connect-src/resources/simple-event-stream": [
+   "124e1ac1e4a03b239a0103fde73b55bbbb0855fd",
    "support"
   ],
-  "content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html": [
-   "9f99f0cf234fdab3b75e6ebf5a8930cd4ad85390",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html.sub.headers": [
-   "48214d030a6de451286fdd8a5aa5e3d48dbca195",
+  "content-security-policy/connect-src/resources/simple-event-stream.headers": [
+   "65d9aec1d11f70ba583642485bd29895eaaca147",
    "support"
   ],
-  "content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html": [
-   "ef8bc915a7f34430a061b35eb3bbcb8bc0613f4d",
+  "content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html": [
+   "46958a48f8781fd30a4ebf967731a9e3294762ee",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html.sub.headers": [
-   "84ceb850c577a075e012a69d339d18768c82ab10",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/report-uri-from-javascript.sub.html": [
-   "521054fb46361026aea231ace408c2e0581b54f2",
+  "content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html": [
+   "189f59ba80a112a6c25c7e86d76d47d6a8531030",
    "testharness"
   ],
-  "content-security-policy/blink-contrib/report-uri-from-javascript.sub.html.sub.headers": [
-   "9f7ff73e85e8ad4f5df51ad435444e325302811b",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/report-uri.sub.html": [
-   "8ac162de430a5e9881fe83722964de23dcb919f0",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/report-uri.sub.html.sub.headers": [
-   "3c601c116f232fe4000799170eae9363fde52bfe",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/alert-fail.html": [
-   "87ae3acd155281670e78fbc5d88da940ed124f27",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/alert-pass.html": [
-   "98fdc9b90f0e756906f9eede8af29c9ab76f0a65",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/blue.css": [
-   "6916730820e3a58647256b75fccc4671dfc138e2",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/document-write-alert-fail.js": [
-   "55f9e74adccef83969d5da859a05bf670f711671",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/generate-csp-report.html": [
-   "f2a3666c68f716d83706259749cfbf6358d32588",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/go-to-echo-report.js": [
-   "cf5a9535e88f5fa1ef702fd67f3abbc66a7707da",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/inject-image.js": [
-   "68c6e9555db81c4c5d3fdbae74d6514f651767f7",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/inject-script.js": [
-   "fa8c28d7bb4c1235e4485d84cb43181d2183106f",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/inject-style.js": [
-   "a48eb434aa6fe0d0a4f664c55e68be03ccd902ed",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/post-message.js": [
-   "c957a15a1c7a0c5dffc9e7a13d54da243ca9a93a",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/postmessage-fail.html": [
-   "5ccfe2ec548aa6e16649c319c8252e608777fe64",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/postmessage-pass.html": [
-   "ddfde964afded9ff5189c8c7554bcb2b1b1e5938",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/script.js": [
-   "2db5164b374d72339c578dc82877625b6cab2b62",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/set-cookie.js.sub.headers": [
-   "ba2f275ccec784515b1b0ac714e7375f9ab4943e",
+  "content-security-policy/connect-src/support/shared-worker-make-xhr-allowed.sub.js": [
+   "82316da6f18de2f6041d5151c63c26b16dc07893",
    "support"
   ],
-  "content-security-policy/blink-contrib/resources/shared-worker-make-xhr-allowed.sub.js": [
-   "79d7203262e2104394968cbffe92a5510da6d767",
+  "content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js": [
+   "82316da6f18de2f6041d5151c63c26b16dc07893",
    "support"
   ],
-  "content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js": [
-   "79d7203262e2104394968cbffe92a5510da6d767",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js.sub.headers": [
+  "content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js.sub.headers": [
    "1b73e7e4a8073542b9ac533bca6c67f6166b4c81",
    "support"
   ],
-  "content-security-policy/blink-contrib/resources/simple-event-stream": [
-   "f31c8d23fe46adf8964955f6259e5af8a11b5577",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/simple-event-stream.headers": [
-   "f7e15b2e1050398ae0a9f734dc84998c4abb459c",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/track.vtt": [
-   "bae9efb1eaafa747c0c14735fd4352971562bf50",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/worker-eval.js": [
-   "0d60a32731386d26cdbf776812cc5c6f06cf0859",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/worker-eval.js.sub.headers": [
-   "6f31a9b9280caefeaafa70ed7c083d66a498fc6b",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/worker-function-function.js": [
-   "4f588f68da51c11b8d1cdc7895a1b3abf4a392a3",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/worker-function-function.js.sub.headers": [
-   "6f31a9b9280caefeaafa70ed7c083d66a498fc6b",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/worker-importscripts.js": [
-   "21f2dac7b379a8e011027853666b623e7651fcc3",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/worker-importscripts.js.sub.headers": [
-   "b5f8abd58a13f7ac8f99871fa004d6f1d6ffb014",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/worker-make-xhr-blocked.sub.js": [
+  "content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js": [
    "0a292c7941bfc0c141fe810672a798ec598862f3",
    "support"
   ],
-  "content-security-policy/blink-contrib/resources/worker-make-xhr-blocked.sub.js.sub.headers": [
+  "content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js.sub.headers": [
    "1b73e7e4a8073542b9ac533bca6c67f6166b4c81",
    "support"
   ],
-  "content-security-policy/blink-contrib/resources/worker-make-xhr.sub.js": [
+  "content-security-policy/connect-src/support/worker-make-xhr.sub.js": [
    "2001aa4e28ea6a6eb704daa455dd36ebcfc650c9",
    "support"
   ],
-  "content-security-policy/blink-contrib/resources/worker-set-timeout.js": [
-   "3f24231bf14cedcc1eb93433e1be60ec74dcb1db",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/resources/worker-set-timeout.js.sub.headers": [
-   "b5f8abd58a13f7ac8f99871fa004d6f1d6ffb014",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html": [
-   "394545e94d4992b3f3dc2ff07809bf7364156d71",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html.sub.headers": [
-   "107129f8144494de98466a80bc5698bf98b5d154",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html": [
-   "4f0171eeb50c89da6bef7f89e053dfe66653701d",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html.sub.headers": [
-   "24b9465e76a321fae0635bc291a42883560c9bb6",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html": [
-   "673d1963d26261c445bd3f0200f11c43a0d74f4b",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html.sub.headers": [
-   "81542dbc5b3fd7a12431190b2dedd932c8e54384",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/sandbox-empty.sub.html": [
-   "405cf86633edc604ff984a136d3567830d76989c",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/sandbox-empty.sub.html.sub.headers": [
-   "72e6b6eb50e8b4ba606763405cf00c368a6c147e",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html": [
-   "5173b77a43904cceb3c8ad34bba62888d1516374",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html.sub.headers": [
-   "c13f16bca1e71c1fb147c4d6b5d4c97caa76faa9",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html": [
-   "7d8319e40063faa95dbc245b65d01dc33f4ecf71",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html.sub.headers": [
-   "6c0fbbd5f1b86e314dd098e9102dfe5debf3b064",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html": [
-   "6b454ec2abc4f1941f33e22ae74000c17231c892",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html.sub.headers": [
-   "aac2e7867bf0dd19672d9503f9a279a150f76abe",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html": [
-   "792aaad8429e87cdc97093ba536219ece2c4fa89",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.sub.headers": [
-   "feb17fd60d3ecb3a232acc1d9e4f5cdc0c01b0eb",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html": [
-   "6ba13cd8288b763b26e5c0244702412d2b3b3b42",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html.sub.headers": [
-   "3cbc8712cb9228623a56ce1095c5b3d9192cddae",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html": [
-   "40b47ca8cc6759e2401111f14b5b81bfbc9adf9c",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html.sub.headers": [
-   "f273d79bdb6ddae989c536f2115750efc8e3f484",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html": [
-   "614f81d1215fd5d12337f896567268c4e2d0306d",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html.sub.headers": [
-   "68ea128df437177266b2e859a6d1f176b4081de4",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/style-allowed.sub.html": [
-   "0d28036b42f823784f2ce0e0f95a704e0cdbf598",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/style-allowed.sub.html.sub.headers": [
-   "b6d44e4afb53e1bb48ab2dcdf7a1520d8112e20e",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/style-blocked.sub.html": [
-   "73269f72ad540a8941b2a4551845fdd0ba46ee16",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/style-blocked.sub.html.sub.headers": [
-   "930b756fe90960a4572f591d5e5428c7b756427a",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html": [
-   "2217802bb2adea7dcd2f59b781788c59fd930d91",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html.sub.headers": [
-   "d3b258f56374b6963c0c94ab16075dd35042edb3",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html": [
-   "ecf5486a42d7148555fb5169c1a52165d77012ec",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.sub.headers": [
-   "7be08395b88c35b0e588084e1aeaf7333058032d",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/worker-eval-blocked.sub.html": [
-   "37ca971b9336a06a2ad31022c779052f1f2b7b9f",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/worker-eval-blocked.sub.html.sub.headers": [
-   "c694c46c3ee08cc89de943334336dd3f5f0c3232",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/worker-from-guid.sub.html": [
-   "1eebc2d6793a0b27b5621b478ed715ebae2fe4b1",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/worker-from-guid.sub.html.sub.headers": [
-   "60296b2284ce99f6fbf57719832d3bd153303f7c",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/worker-function-function-blocked.sub.html": [
-   "7609e9635b6df0eb15c355806b35a028918eaa44",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/worker-function-function-blocked.sub.html.sub.headers": [
-   "17281a64ceef272ac327a933c07a1d2a3fcec0fa",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html": [
-   "ddf2a7f8695d439a9bf4d15d08fe48e7655644f2",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html.sub.headers": [
-   "daa1f9f28a3878acd695561ab418d5b6b22ffde0",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/worker-script-src.sub.html": [
-   "2bfd9cb4ae8c62e1e5a8691b35e9246e711f4929",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/worker-script-src.sub.html.sub.headers": [
-   "9f62e8f34652d4bf80ac03a527a2bc45b51cc89d",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html": [
-   "62b2d0c3df164eaa561723e48b66aa3806d383df",
-   "testharness"
-  ],
-  "content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html.sub.headers": [
-   "2aad5ef9a86041edf96af7630eab69b24ae69332",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/xsl-blocked-expected.png": [
-   "382f72b9bfaf76ca76bedb643f917700e33e582a",
-   "support"
-  ],
-  "content-security-policy/blink-contrib/xsl-unaffected-by-style-src-1-expected.png": [
-   "382f72b9bfaf76ca76bedb643f917700e33e582a",
-   "support"
-  ],
-  "content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html": [
-   "3cfb06c55ac7dc026170b1ae886beba63cebac57",
-   "testharness"
-  ],
-  "content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html.sub.headers": [
-   "a042bfb6a20b4dee27d81fe8eda457536a4b09bc",
-   "support"
-  ],
-  "content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html": [
-   "34d092dcdd9d2c2287b1b15b16e6df3d70bcf666",
-   "testharness"
-  ],
-  "content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html.sub.headers": [
-   "66526f2ff5107dee1f999feb96d0ed0b1eea0b20",
-   "support"
-  ],
-  "content-security-policy/child-src/child-src-allowed.sub.html": [
-   "8e70e19dbaffa7ca6b45b84b860eb11e343ce630",
-   "testharness"
-  ],
-  "content-security-policy/child-src/child-src-allowed.sub.html.sub.headers": [
-   "2fd7d14ff9446ef3208893c0e49c273afcfd8abf",
-   "support"
-  ],
-  "content-security-policy/child-src/child-src-blocked.sub.html": [
-   "19fd649af944749546aee5af41fc2b4d7f135aed",
-   "testharness"
-  ],
-  "content-security-policy/child-src/child-src-blocked.sub.html.sub.headers": [
-   "da6c31fe646685e11c57558db29d9ba8ee1b697b",
-   "support"
-  ],
-  "content-security-policy/child-src/child-src-conflicting-frame-src.sub.html": [
-   "8c903c4be2ccb11bdaff13fc3ae8690fe04ba755",
-   "testharness"
-  ],
-  "content-security-policy/child-src/child-src-conflicting-frame-src.sub.html.sub.headers": [
-   "5ac25b74237593f6fc32c87f9a715e1cd99b5f9b",
-   "support"
-  ],
-  "content-security-policy/child-src/child-src-cross-origin-load.sub.html": [
-   "51bbb0f02e67722433604c78f54a8619cb498dc0",
-   "testharness"
-  ],
-  "content-security-policy/child-src/child-src-cross-origin-load.sub.html.sub.headers": [
-   "a7b058f47360dee56f92e6caa3cc5eab1dc3706f",
-   "support"
-  ],
-  "content-security-policy/child-src/child-src-redirect-blocked.sub.html": [
-   "1d7108c31df11379c79181a21a37822a5137fa73",
-   "testharness"
-  ],
-  "content-security-policy/child-src/child-src-redirect-blocked.sub.html.sub.headers": [
-   "268d2bc1c16366626596649ea24b776609849f9e",
-   "support"
-  ],
-  "content-security-policy/child-src/child-src-worker-allowed.sub.html": [
-   "da18b70d2f859c83f1599e5f65bfeb67d1183ee4",
-   "testharness"
-  ],
-  "content-security-policy/child-src/child-src-worker-blocked.sub.html": [
-   "16fc87d40c7466de1b59674abc4510c29c7d8cd2",
+  "content-security-policy/connect-src/worker-connect-src-allowed.sub.html": [
+   "90077f2f139263466c0b54cd7270d166803f53de",
    "testharness"
   ],
-  "content-security-policy/connect-src/connect-src-beacon-blocked.sub.html": [
-   "4d88ea8d1c46369639c32b8301cfface99c0bef2",
+  "content-security-policy/connect-src/worker-connect-src-blocked.sub.html": [
+   "2a2a9b9f623540830b5706fd775e77c83f3ba204",
    "testharness"
   ],
-  "content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html": [
-   "24c0dc7a38b3b8f2e7cd6c3e352e8b3c5c401550",
+  "content-security-policy/connect-src/worker-from-guid.sub.html": [
+   "248d6ee42d35b86731241d499da2c4933abf4acd",
    "testharness"
   ],
-  "content-security-policy/connect-src/connect-src-websocket-blocked.sub.html": [
-   "09e6da88277b530a139865802daa34036fc939fd",
+  "content-security-policy/default-src/default-src-inline-allowed.sub.html": [
+   "ce6bfbbf82e7726ff4fcdc68c825f3b40c4d68a4",
    "testharness"
   ],
-  "content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html": [
-   "2317a621398eb27ba7748481fdb55583a014d95d",
+  "content-security-policy/default-src/default-src-inline-blocked.sub.html": [
+   "641cfd22caf72bf72979780db9ad2c30f6a6dd81",
    "testharness"
   ],
   "content-security-policy/embedded-enforcement/allow_csp_from-header.html": [
@@ -413284,6 +411950,38 @@
    "888d3e58d3d094b767067e16494803af432ee057",
    "testharness"
   ],
+  "content-security-policy/form-action/form-action-src-allowed.sub.html": [
+   "d0c2dcbb18201b72964f4da5f94b8c200fa02cad",
+   "testharness"
+  ],
+  "content-security-policy/form-action/form-action-src-blocked.sub.html": [
+   "79e13ef60248d7e9e8023ea732323b28cb9a759a",
+   "testharness"
+  ],
+  "content-security-policy/form-action/form-action-src-default-ignored.sub.html": [
+   "5f58d690b1c34df03eda8fef24a009e445ea8613",
+   "testharness"
+  ],
+  "content-security-policy/form-action/form-action-src-get-allowed.sub.html": [
+   "efdb9fbe5f20c3f3bd80652dc00315b1451335a3",
+   "testharness"
+  ],
+  "content-security-policy/form-action/form-action-src-get-blocked.sub.html": [
+   "2a4938e17599ff5f13e6d6145e664e20d6f58f94",
+   "testharness"
+  ],
+  "content-security-policy/form-action/form-action-src-javascript-blocked.sub.html": [
+   "999961356ce31260c76d5e8e88986c5d8d46ba8c",
+   "testharness"
+  ],
+  "content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.sub.headers": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "content-security-policy/form-action/form-action-src-redirect-blocked.sub.html": [
+   "81d61061da04d7f1e9f4f64a4bd18734a736ca96",
+   "testharness"
+  ],
   "content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html": [
    "e96b19c03463de925f03a666a173e948c0908302",
    "testharness"
@@ -413428,6 +412126,26 @@
    "51e1354d16cfa4967e91206be8bd0d8c6ca577af",
    "support"
   ],
+  "content-security-policy/frame-src/frame-src-about-blank-allowed-by-default.sub.html": [
+   "91001ba752be5e786acbfc6c57f335ddba16605e",
+   "testharness"
+  ],
+  "content-security-policy/frame-src/frame-src-about-blank-allowed-by-scheme.sub.html": [
+   "d976131d2dfbc04755013b2ad4a27ea039736fae",
+   "testharness"
+  ],
+  "content-security-policy/frame-src/frame-src-allowed.sub.html": [
+   "c4d9df2e0b97b44c4f2ab074a854a9cf55e26e3c",
+   "testharness"
+  ],
+  "content-security-policy/frame-src/frame-src-blocked.sub.html": [
+   "91eaa87b022bc167d9f7fd54a9ca2a5afe8d2d1c",
+   "testharness"
+  ],
+  "content-security-policy/frame-src/frame-src-cross-origin-load.sub.html": [
+   "038162daac02409090b2c38ce40b889ee36b5f07",
+   "testharness"
+  ],
   "content-security-policy/frame-src/frame-src-redirect.html": [
    "16ac0d81d039fc2514b72a68fa491159ad46f59c",
    "testharness"
@@ -413448,90 +412166,62 @@
    "c11acf3aff5ffaf1a581ff8c73f077b7c0ee0a26",
    "support"
   ],
+  "content-security-policy/generic/duplicate-directive.sub.html": [
+   "32b30073d40e92a5f37784107666b61c5e366b06",
+   "testharness"
+  ],
   "content-security-policy/generic/fail-0_1.js": [
    "357bbab837dcc2794a46fb07e31ea49b16b447cf",
    "support"
   ],
-  "content-security-policy/generic/generic-0_1-img-src.html": [
-   "b9e456586e6acc8f56864ab36bea8c9ff67b3959",
+  "content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html": [
+   "3a701ef1c3fd50166c4997857c5140f05d236baa",
    "testharness"
   ],
-  "content-security-policy/generic/generic-0_1-img-src.html.sub.headers": [
-   "ab1abd1bbb19ba7993d1d14e361171253224b7cb",
-   "support"
+  "content-security-policy/generic/filesystem-urls-match-filesystem.sub.html": [
+   "920d9db57ca6129fc91ad08ad91a606c7cf0c92b",
+   "testharness"
   ],
-  "content-security-policy/generic/generic-0_1-script-src.html": [
-   "d1d01090fb8ae7f33357d0d4d75e2606d637a881",
+  "content-security-policy/generic/generic-0_1-img-src.html": [
+   "9c9ecb2f935d93d18ecf6175b0645b98f409d595",
    "testharness"
   ],
-  "content-security-policy/generic/generic-0_1-script-src.html.sub.headers": [
-   "0596cdfbe4fda423101bb8bea3a7d732903b74cb",
-   "support"
+  "content-security-policy/generic/generic-0_1-script-src.html": [
+   "cb765191d00459fcdd69c31b9b2a7d7f87bd09b3",
+   "testharness"
   ],
   "content-security-policy/generic/generic-0_10.html": [
-   "31f03b4b65e85d07610dd376415eeca43f7f91a2",
+   "bda8cdc3f50bc52a20a396febb6d305e64b00292",
    "testharness"
   ],
-  "content-security-policy/generic/generic-0_10.html.sub.headers": [
-   "16ab2c0e27dcca98ec2546d0e7196961bcbf30e3",
-   "support"
-  ],
   "content-security-policy/generic/generic-0_10_1.sub.html": [
-   "631cbab994285429f906832b4a192243bdc19009",
+   "9c6717bff2355b320c43ea60d01ba1aa0689f818",
    "testharness"
   ],
-  "content-security-policy/generic/generic-0_10_1.sub.html.sub.headers": [
-   "a3af477cdf51f8f6848edc913aa7601cf2c6a6b5",
-   "support"
-  ],
   "content-security-policy/generic/generic-0_2.html": [
-   "bdad4dc8303926e800159b6548c983a8b6261a74",
+   "1be199db848a5ce5a80255aa4013dd763c7859cd",
    "testharness"
   ],
-  "content-security-policy/generic/generic-0_2.html.sub.headers": [
-   "6e8122bdd2f39fade65c209582bbd7ece84bd627",
-   "support"
-  ],
   "content-security-policy/generic/generic-0_2_2.sub.html": [
-   "3ddc5a08c817fdc0d31826e170d08eb0b2261f20",
+   "8f275f169e1257400cea6e7dff26b0d457f3f82f",
    "testharness"
   ],
-  "content-security-policy/generic/generic-0_2_2.sub.html.sub.headers": [
-   "a6707834e433b30a0a31eb5300b6621cd6982583",
-   "support"
-  ],
   "content-security-policy/generic/generic-0_2_3.html": [
-   "ad2f16b5c0ac137f2d0c847de0e27ca87e7faaf5",
+   "c202f424814bb3c4f662c8fbec49031ed3ed405f",
    "testharness"
   ],
-  "content-security-policy/generic/generic-0_2_3.html.sub.headers": [
-   "1e3dde6acf0b11c9f2c0f1b56497ea84a879d978",
-   "support"
-  ],
-  "content-security-policy/generic/generic-0_8.html": [
-   "e536ca439e419494b32fd5d8c3041b3edc4dd6fb",
+  "content-security-policy/generic/generic-0_8.sub.html": [
+   "6e9aeddf1a5e308036ca1a659d138cc45fd7ea00",
    "testharness"
   ],
-  "content-security-policy/generic/generic-0_8.html.sub.headers": [
-   "a589ee90bb6c25f843d155477d281d3fabd9cb73",
-   "support"
-  ],
   "content-security-policy/generic/generic-0_8_1.sub.html": [
-   "c8fcd374917a8acd3ae198ddda1b59e150048739",
+   "e5913fc5feb3e2352172c96e366389e4216c55f3",
    "testharness"
   ],
-  "content-security-policy/generic/generic-0_8_1.sub.html.sub.headers": [
-   "e9ebd794d83d50b03f63c1cc97b5cb739490bab4",
-   "support"
-  ],
   "content-security-policy/generic/generic-0_9.sub.html": [
-   "b8ccc5ebb8b8f106bd284bb733dc8c808cc72dff",
+   "5b0adf26a3922c5a596333ea26a4102066e8ff8a",
    "testharness"
   ],
-  "content-security-policy/generic/generic-0_9.sub.html.sub.headers": [
-   "0f07964b8a88d54ac34b8f935c21026b43e89280",
-   "support"
-  ],
   "content-security-policy/generic/negativeTests.js": [
    "1d2009b245fa9483ad9058e0a587d5873e3578f3",
    "support"
@@ -413548,10 +412238,26 @@
    "949851a16fd799f6610bb3e657fa7ab5b7949a90",
    "support"
   ],
+  "content-security-policy/generic/policy-does-not-affect-child.sub.html": [
+   "7e092f21440fffed98068f59bd2ddfd09a683515",
+   "testharness"
+  ],
   "content-security-policy/generic/positiveTest.js": [
    "92b715fcc3269e189318734739a5e4fb620d9dff",
    "support"
   ],
+  "content-security-policy/generic/support/log-pass.html": [
+   "03f6e0aabd03e9fb466e9e2cd4c25b5771c93d6e",
+   "support"
+  ],
+  "content-security-policy/generic/support/sandboxed-eval.sub.html": [
+   "9e3166cf823bb833845d79c8113aa7edc579aad5",
+   "support"
+  ],
+  "content-security-policy/generic/support/sandboxed-eval.sub.html.sub.headers": [
+   "84ab95803795a77af210cb4d713319b8a9115c81",
+   "support"
+  ],
   "content-security-policy/generic/unreached.js": [
    "a008295dfc5bd220f3c5a006b564c8e6c944402c",
    "support"
@@ -413576,6 +412282,14 @@
    "4a94d606c13066d1efaee4927d2f6c66492d0965",
    "support"
   ],
+  "content-security-policy/img-src/icon-allowed.sub.html": [
+   "acf5d3ccb7f6601996946465d35d8f6db017c25a",
+   "testharness"
+  ],
+  "content-security-policy/img-src/icon-blocked.sub.html": [
+   "24dd82f6f491b6a4653d00c05e3b62d3d9061e2e",
+   "testharness"
+  ],
   "content-security-policy/img-src/img-src-4_1.sub.html": [
    "d83e0f50e07a493a8040a13b00c8890d16f1ba1e",
    "testharness"
@@ -413604,6 +412318,10 @@
    "4114664a54645718ccbb5292f5103dc1942724aa",
    "testharness"
   ],
+  "content-security-policy/img-src/report-blocked-data-uri.sub.html": [
+   "f02bba15ec69f160d825ae2698008fb83dda5362",
+   "testharness"
+  ],
   "content-security-policy/inheritance/iframe.html": [
    "3121f2277196e721af7d8cd522be148c875c79bd",
    "testharness"
@@ -413645,67 +412363,43 @@
    "support"
   ],
   "content-security-policy/media-src/media-src-7_1.html": [
-   "ce49162aecb9ca292ceeaa65b7a4206d430d21b4",
+   "dccf6c0e20dc0f109ecd40e59b27e0e37815487d",
    "testharness"
   ],
-  "content-security-policy/media-src/media-src-7_1.html.sub.headers": [
-   "4a918e8bcec9726cd388ae1d518d6e1a4d700823",
-   "support"
-  ],
   "content-security-policy/media-src/media-src-7_1_2.sub.html": [
-   "0ee3a4df705e1281c16bb0f71d24af881a1f0f60",
+   "fe5327fdd729fc7b47ad7eb963e22901df1cb692",
    "testharness"
   ],
-  "content-security-policy/media-src/media-src-7_1_2.sub.html.sub.headers": [
-   "71308d3aaf2908bb3d40469a64ace31e8eb41c44",
-   "support"
-  ],
   "content-security-policy/media-src/media-src-7_2.html": [
-   "b6c8bb9af6530ccd7ab1d1ade214d4b0b6678017",
+   "23257fa9395dae688804fcefaf4ec44bcb9995d3",
    "testharness"
   ],
-  "content-security-policy/media-src/media-src-7_2.html.sub.headers": [
-   "2b3e01914edac2809467daddfe5044030244020c",
-   "support"
-  ],
   "content-security-policy/media-src/media-src-7_2_2.sub.html": [
-   "e1cad846ee8e7d42a3ea130427f5b61e863a5836",
+   "d6dee44a6d82d50693a24e0de6eaab735372b37f",
    "testharness"
   ],
-  "content-security-policy/media-src/media-src-7_2_2.sub.html.sub.headers": [
-   "a561247903c77984842c4e4c02459d713c0de5dd",
-   "support"
-  ],
   "content-security-policy/media-src/media-src-7_3.sub.html": [
-   "dba52c4be3092a637eb129e626502c93322df44d",
+   "ff35e0bb1d1cebf81fd12d054960b489f7a088b9",
    "testharness"
   ],
-  "content-security-policy/media-src/media-src-7_3.sub.html.sub.headers": [
-   "05bab36a991f04ab8144daaa582e396863276aba",
-   "support"
-  ],
   "content-security-policy/media-src/media-src-7_3_2.sub.html": [
-   "7484051e7dc1e270e5251b5684cbb95cb900ccf7",
+   "401bd857abb420f17a3b548ef49ad0b1545e0144",
    "testharness"
   ],
-  "content-security-policy/media-src/media-src-7_3_2.sub.html.sub.headers": [
-   "c7623ee2c025f15eede625064f062d927543803a",
-   "support"
-  ],
   "content-security-policy/media-src/media-src-blocked.sub.html": [
-   "d7af07adf3ff35f0067f551c41c74c49d8daaa36",
+   "e5b408c372c8c2c152dc28ba947c6b41b8429ab9",
    "testharness"
   ],
-  "content-security-policy/media-src/media-src-blocked.sub.html.sub.headers": [
-   "e87df4f2889add93d8c50b79a00e830d76309a75",
-   "support"
-  ],
   "content-security-policy/media-src/media-src-redir-bug.sub.html": [
-   "581a76348d3c8cc415c2ac109f587a5a0b6ded23",
+   "c5d7eb88656e3fc0033588ae3c40c42e293c7528",
    "testharness"
   ],
-  "content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers": [
-   "578cb8e80efdf326dc8bbf43837cc1771c549352",
+  "content-security-policy/meta/combine-header-and-meta-policies.sub.html": [
+   "779f494e1bce17d77c0f8a989de51b6195544563",
+   "testharness"
+  ],
+  "content-security-policy/meta/combine-header-and-meta-policies.sub.html.sub.headers": [
+   "2d517e1fc03a9f17950cf1e2f5038dc30c4baf3e",
    "support"
   ],
   "content-security-policy/meta/meta-img-src.html": [
@@ -413716,6 +412410,18 @@
    "2553698b40d91f95f33bb14e7bd906d665b0381a",
    "testharness"
   ],
+  "content-security-policy/meta/meta-outside-head.sub.html": [
+   "fba000a28972d683adaeebc87e5e6d6723877ae2",
+   "testharness"
+  ],
+  "content-security-policy/meta/meta-outside-head.sub.html.sub.headers": [
+   "70b00e4a7744eace700e28c2e9bd7a5d5c92438f",
+   "support"
+  ],
+  "content-security-policy/meta/support/metaHelper.js": [
+   "ff614bd9c4e37c02c8027c6b38fc615c0ade6883",
+   "support"
+  ],
   "content-security-policy/navigation/javascript-url-navigation-inherits-csp.html": [
    "bb01b98b633fe5ffb79b1b4e0943a77b85a11057",
    "testharness"
@@ -413776,20 +412482,144 @@
    "1444276d7a28bcb29f4dc5a0c3d2277bf875cf7e",
    "support"
   ],
+  "content-security-policy/object-src/object-src-no-url-allowed.sub.html": [
+   "a85443300d2be432fa3025e01d9cc780fe21dabf",
+   "testharness"
+  ],
+  "content-security-policy/object-src/object-src-no-url-blocked.sub.html": [
+   "90c4f7a4f961cacaf6afa3c03b604ddd8f9779f3",
+   "testharness"
+  ],
+  "content-security-policy/object-src/object-src-url-allowed.sub.html": [
+   "6378b3642e53956c4d8bd77b7ddc8aeac3b94a50",
+   "testharness"
+  ],
+  "content-security-policy/object-src/object-src-url-blocked.sub.html": [
+   "c911e6eb2a4cdd98e955670d8a8d093a62a1c9a2",
+   "testharness"
+  ],
+  "content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html": [
+   "a60672a9027da15685e9cb7eb5cb5dbd25f2dbf6",
+   "testharness"
+  ],
+  "content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html": [
+   "8ba00db9212bc4add15140265fa9e476f09acc25",
+   "testharness"
+  ],
+  "content-security-policy/plugin-types/plugintypes-notype-data.sub.html": [
+   "948d73c56633882dbaa7816e066d21a0a17bafaf",
+   "testharness"
+  ],
+  "content-security-policy/plugin-types/plugintypes-notype-url.sub.html": [
+   "fa4af21136d56dfe574735da37dbec56909c10bb",
+   "testharness"
+  ],
+  "content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html": [
+   "f353383d7539fbd09c40587181a328571241962a",
+   "testharness"
+  ],
+  "content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html": [
+   "cae24a6958eae450d1b21a47f4e13c407cac33be",
+   "testharness"
+  ],
+  "content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html": [
+   "7be3a72eb885841e8ccb674eeae3761f638adf2c",
+   "testharness"
+  ],
+  "content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html.sub.headers": [
+   "ddf99f2d2ed8bdfa56f5efbf371b324924c1c286",
+   "support"
+  ],
+  "content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html": [
+   "19e6a43463fb72a74a0a03e2515d564f2df49234",
+   "testharness"
+  ],
+  "content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html.sub.headers": [
+   "588c5767e4d7290ea7fd27be8218dd8420982848",
+   "support"
+  ],
+  "content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html": [
+   "08311936720a8ee3835d029f572e924dd4f45e6e",
+   "testharness"
+  ],
+  "content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html.sub.headers": [
+   "d0dddb85abb59ded83c36f71b4776881ce626e40",
+   "support"
+  ],
+  "content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html": [
+   "41f777a06556d6cb4d8110d4d1fe70a6e58c2709",
+   "testharness"
+  ],
+  "content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html.sub.headers": [
+   "1d58caea3b04f568e837678dbd27136fec73730c",
+   "support"
+  ],
+  "content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html": [
+   "131b261ef9a6b79714eeacd4c9a525bdfafab21c",
+   "testharness"
+  ],
+  "content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html.sub.headers": [
+   "966fcc13016f5980750ad1a4d5acf240762c2e0d",
+   "support"
+  ],
   "content-security-policy/reporting/securitypolicyviolation-idl.html": [
-   "ff5ed000c0c33f0e0495493e41ed4330844ec780",
+   "5f64e7ffb556afda675d52b7f9987f04612dccfd",
+   "testharness"
+  ],
+  "content-security-policy/sandbox/iframe-inside-csp.sub.html": [
+   "11e165b77d866a5b62539d5722b18885838448a7",
+   "testharness"
+  ],
+  "content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html": [
+   "f32084b66483ddcc8a205f889e06b1d43d2b0d2a",
    "testharness"
   ],
+  "content-security-policy/sandbox/sandbox-allow-scripts.sub.html": [
+   "0acaeda7770b1dd0e0149233cfedf9ecd7db1c5a",
+   "testharness"
+  ],
+  "content-security-policy/sandbox/sandbox-empty-subframe.sub.html": [
+   "a4a3f92312327e36710eb52383509860cdfa0588",
+   "testharness"
+  ],
+  "content-security-policy/sandbox/sandbox-empty.sub.html": [
+   "406bf1c6082a4feb86d1b45b16ebc07c23dadfcb",
+   "testharness"
+  ],
+  "content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html": [
+   "ce1a3a812631604b26452fac945a87bd0bf9152c",
+   "support"
+  ],
+  "content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html.sub.headers": [
+   "f161272e257353dbe121030cbec0de00218757ff",
+   "support"
+  ],
+  "content-security-policy/sandbox/support/sandboxed-eval.sub.html": [
+   "9e3166cf823bb833845d79c8113aa7edc579aad5",
+   "support"
+  ],
+  "content-security-policy/sandbox/support/sandboxed-eval.sub.html.sub.headers": [
+   "84ab95803795a77af210cb4d713319b8a9115c81",
+   "support"
+  ],
+  "content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html": [
+   "e255368c5e546322c63854d59abb48814d36d8b8",
+   "support"
+  ],
+  "content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html.sub.headers": [
+   "f161272e257353dbe121030cbec0de00218757ff",
+   "support"
+  ],
   "content-security-policy/script-src/10_1_support_1.js": [
-   "bd10b9f495c679323ceeba54bf04a48c8a2fd4b4",
+   "6916d52aa90921bb59cd9a677f58176255f4f2fd",
    "support"
   ],
   "content-security-policy/script-src/10_1_support_2.js": [
-   "d7cde9fb4644245699893333e230d1c5fd79ca71",
+   "ee8d6589daed63364ed139a6776a787efc4ba44d",
    "support"
   ],
   "content-security-policy/script-src/addInlineTestsWithDOMManipulation.js": [
-   "ec7ba8726955690cee6a7f75b002a3d0d39db7d0",
+   "2ec0aedb07299313f8f337d6a1cb620f1da57a4a",
    "support"
   ],
   "content-security-policy/script-src/buildInlineWorker.js": [
@@ -413808,16 +412638,24 @@
    "9747ab396294e301c0f0720a3c0731d92272ee54",
    "support"
   ],
+  "content-security-policy/script-src/injected-inline-script-allowed.sub.html": [
+   "97467a87b6933ec7dda0b788104e63e5cbed8b7e",
+   "testharness"
+  ],
+  "content-security-policy/script-src/injected-inline-script-blocked.sub.html": [
+   "a5c509b140558716410ca00337542c158c5742fe",
+   "testharness"
+  ],
   "content-security-policy/script-src/inlineSuccessTest.js": [
-   "a591a02337841f6e8e822174a390a723ee6a3656",
+   "730190d637dee362ce20ce82aaed663c873dcbce",
    "support"
   ],
   "content-security-policy/script-src/inlineTests.js": [
-   "9256478a189aeabb765763a48fda9a6fd2ab077e",
+   "b07e007c036a4856f9bc11064639c65a97cf30bb",
    "support"
   ],
   "content-security-policy/script-src/javascript-window-open-blocked.html": [
-   "7d047c4966eee6c35a6bf24a80b4fbb672cb89b4",
+   "8907681d25a20a954c4db413d0fd78efd9dc6199",
    "testharness"
   ],
   "content-security-policy/script-src/javascript-window-open-blocked.html.sub.headers": [
@@ -413825,107 +412663,75 @@
    "support"
   ],
   "content-security-policy/script-src/script-src-1_1.html": [
-   "c547fd94e350bfd49541734515a4068de44f525d",
+   "b4285b63b3f9a8fab266ac93b3b7c1a70a7bdfcc",
    "testharness"
   ],
-  "content-security-policy/script-src/script-src-1_1.html.sub.headers": [
-   "58cb9b7acbda0e8017a83c1598f0ea1ea5f8cf4f",
-   "support"
-  ],
   "content-security-policy/script-src/script-src-1_10.html": [
-   "5a55427c869b1c5a0bee3ecf4619846f072d1e53",
+   "8d86fa302fa6f1262ab5c880bf2ce756f606d661",
    "testharness"
   ],
-  "content-security-policy/script-src/script-src-1_10.html.sub.headers": [
-   "c6da3920eb563d64585901f1e94aaa11a76e5270",
-   "support"
-  ],
   "content-security-policy/script-src/script-src-1_10_1.html": [
-   "a97e3cbdce7084b97eee28be5e3d3d42b5803966",
+   "46f535a4b373bdcc2b69ad78d333fb76d5f485bc",
    "testharness"
   ],
-  "content-security-policy/script-src/script-src-1_10_1.html.sub.headers": [
-   "ad7550efbc8ebb318bb2e32d96ea575c78596ffd",
-   "support"
-  ],
   "content-security-policy/script-src/script-src-1_2.html": [
-   "b3356097531989881006c444d0412cd8d488ca6e",
+   "e3b1b1ffe070be0258e18563c14b4af4e0b4f5e3",
    "testharness"
   ],
-  "content-security-policy/script-src/script-src-1_2.html.sub.headers": [
-   "b90d160699a5c3144933a0f4a5f79236aefb9ae0",
-   "support"
-  ],
   "content-security-policy/script-src/script-src-1_2_1.html": [
-   "907c529ec0b1186e72dd6ac095e46c001413639e",
+   "548eefcd46832140999a2754d7f62ad508cc7e28",
    "testharness"
   ],
-  "content-security-policy/script-src/script-src-1_2_1.html.sub.headers": [
-   "5e47b083224fa789bf14f90e4be4d72807d448e4",
-   "support"
-  ],
   "content-security-policy/script-src/script-src-1_3.html": [
-   "027ae9ff64cf5d1599541d0a2a5804096f71aad0",
+   "abf79935376e924c9fc1c8fea6f3b6d1c0b52227",
    "testharness"
   ],
-  "content-security-policy/script-src/script-src-1_3.html.sub.headers": [
-   "6e86dbda4c9fa33a27df5f25bca3e56a367eb5c6",
-   "support"
-  ],
   "content-security-policy/script-src/script-src-1_4.html": [
-   "62ba9216e12868cf0a6b4f791bf5305daa21dac6",
+   "d7369a16421ca7aadca158b0a6aff8c4cde35487",
    "testharness"
   ],
-  "content-security-policy/script-src/script-src-1_4.html.sub.headers": [
-   "8d484ffc9bb161edd31b0fb349a67eb0c5a30e7c",
-   "support"
-  ],
   "content-security-policy/script-src/script-src-1_4_1.html": [
-   "ff43ce545cc42d33809b5f48efe6f52bf57ccd41",
+   "4ac0b814c672862a1628e5e6c7fd4a6541a1421f",
    "testharness"
   ],
-  "content-security-policy/script-src/script-src-1_4_1.html.sub.headers": [
-   "90288741141736b1d59cc27070565e08393d821f",
-   "support"
-  ],
   "content-security-policy/script-src/script-src-1_4_2.html": [
-   "5a1d5c9393455aeb34a73a1c59c6d75783a3d936",
+   "6047332aa8240cc0e53e88d72834efcc8cfea2fd",
    "testharness"
   ],
-  "content-security-policy/script-src/script-src-1_4_2.html.sub.headers": [
-   "4c2700452b8e0cb5451ee00aaa8ff92f12e9623e",
-   "support"
-  ],
   "content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html": [
-   "0f0f571fbc0db3b96112cb62f66d03c45674c127",
+   "66c96a85d3accfb20317501504ca3187ba7683f8",
    "testharness"
   ],
   "content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers": [
-   "dec2d5659d318a58d7e957837ce3a217db2ea649",
+   "384cbb40a778c35dcfc5dc68e5ba26932e00445e",
    "support"
   ],
   "content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html": [
-   "c0407821e7f7de5d80d601c7e693b0e283902e61",
+   "746a6b0340e1fa2e04b13c58c86644fcb8452516",
    "testharness"
   ],
   "content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers": [
-   "39b7686073001e610bee5ba2a2c1083080b1aa68",
+   "4ea96701507b699f643a8ed77b7f20b443705e4c",
    "support"
   ],
+  "content-security-policy/script-src/script-src-overrides-default-src.sub.html": [
+   "0a9b52068142f29c21aaafdd81cff93997cef83e",
+   "testharness"
+  ],
   "content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html": [
-   "f43c7510cf175e41d18b87f084136efeb22a0d86",
+   "9666194acc39933368bc101c53e3870a7d326f82",
    "testharness"
   ],
   "content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers": [
-   "6d5a35850052379753d5e39fe30aca1ddc9635f7",
+   "71ef442f2942a4d35c1d8ee95812c866d79fbda0",
    "support"
   ],
   "content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html": [
-   "a7b51858b4c9a967bf740e76a5e1de726f5dfcdd",
+   "d3a1f5be326ff4d394c4f436073a6c7a930292fb",
    "testharness"
   ],
   "content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers": [
-   "57c9026a7add5b8de2b153b14039787d44cbfa83",
+   "1001cdd06a04940bb842604ec0d05974df28d8ce",
    "support"
   ],
   "content-security-policy/script-src/script-src-sri_hash.sub.html": [
@@ -414072,10 +412878,118 @@
    "a59f7f33614eb541a216b317f0916271f359ba1b",
    "testharness"
   ],
+  "content-security-policy/script-src/script-src-wildcards-disallowed.html": [
+   "ac7823a256033e87a13cd4adbba5b38be2186ed6",
+   "testharness"
+  ],
+  "content-security-policy/script-src/scripthash-allowed.sub.html": [
+   "4aa8f4058f410362e90a73d375f840f88cd817b4",
+   "testharness"
+  ],
+  "content-security-policy/script-src/scripthash-basic-blocked.sub.html": [
+   "8ba09b0a1520cd37f5760eb2d05f0215806c26b7",
+   "testharness"
+  ],
+  "content-security-policy/script-src/scripthash-default-src.sub.html": [
+   "600e953f5a40f0b60bdf688373a90deda26ea8f1",
+   "testharness"
+  ],
+  "content-security-policy/script-src/scripthash-ignore-unsafeinline.sub.html": [
+   "889f4aa2b207840edae87e54cb3279d10ee878af",
+   "testharness"
+  ],
+  "content-security-policy/script-src/scripthash-unicode-normalization.sub.html": [
+   "b6057a379a8d58c7bf3addfc129193ea133ff357",
+   "testharness"
+  ],
+  "content-security-policy/script-src/scriptnonce-allowed.sub.html": [
+   "96da19d4317ef05eee97b3908bfe9328f83b0d18",
+   "testharness"
+  ],
+  "content-security-policy/script-src/scriptnonce-and-scripthash.sub.html": [
+   "109eaf98df9462e92bbc55e0424ca797959f10d9",
+   "testharness"
+  ],
+  "content-security-policy/script-src/scriptnonce-basic-blocked.sub.html": [
+   "ad272e92d65c2ed23d157a7d2bab1754f40d1a38",
+   "testharness"
+  ],
+  "content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html": [
+   "7b478334968d2ac392955f56809c09299a3cb68b",
+   "testharness"
+  ],
+  "content-security-policy/script-src/scriptnonce-redirect.sub.html": [
+   "b9a978d217ea0f61ca6c3a117aefbbf3a606450c",
+   "testharness"
+  ],
   "content-security-policy/script-src/simpleSourcedScript.js": [
    "549c6ea1f1bae2b78f933b5da0a5f2f72bae2564",
    "support"
   ],
+  "content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html": [
+   "2449c9a6e32f0b015c79f46276637c6acee346c7",
+   "testharness"
+  ],
+  "content-security-policy/script-src/support/inject-script.js": [
+   "0b03b0c731df1717f2dfe72bc1d1e1cabad06776",
+   "support"
+  ],
+  "content-security-policy/script-src/support/post-message.js": [
+   "c957a15a1c7a0c5dffc9e7a13d54da243ca9a93a",
+   "support"
+  ],
+  "content-security-policy/script-src/support/worker-eval.js": [
+   "0d60a32731386d26cdbf776812cc5c6f06cf0859",
+   "support"
+  ],
+  "content-security-policy/script-src/support/worker-eval.js.sub.headers": [
+   "6f31a9b9280caefeaafa70ed7c083d66a498fc6b",
+   "support"
+  ],
+  "content-security-policy/script-src/support/worker-function-function.js": [
+   "4f588f68da51c11b8d1cdc7895a1b3abf4a392a3",
+   "support"
+  ],
+  "content-security-policy/script-src/support/worker-function-function.js.sub.headers": [
+   "6f31a9b9280caefeaafa70ed7c083d66a498fc6b",
+   "support"
+  ],
+  "content-security-policy/script-src/support/worker-importscripts.js": [
+   "c59a747c05ce77c64bc6672b4c82c2964b967500",
+   "support"
+  ],
+  "content-security-policy/script-src/support/worker-importscripts.js.sub.headers": [
+   "b5f8abd58a13f7ac8f99871fa004d6f1d6ffb014",
+   "support"
+  ],
+  "content-security-policy/script-src/support/worker-set-timeout.js": [
+   "3f24231bf14cedcc1eb93433e1be60ec74dcb1db",
+   "support"
+  ],
+  "content-security-policy/script-src/support/worker-set-timeout.js.sub.headers": [
+   "b5f8abd58a13f7ac8f99871fa004d6f1d6ffb014",
+   "support"
+  ],
+  "content-security-policy/script-src/worker-eval-blocked.sub.html": [
+   "18e53909393384074c14d309897c373717f8d948",
+   "testharness"
+  ],
+  "content-security-policy/script-src/worker-function-function-blocked.sub.html": [
+   "90954896222f9e2637140580b11cc984fc5157cf",
+   "testharness"
+  ],
+  "content-security-policy/script-src/worker-importscripts-blocked.sub.html": [
+   "21ce1f88689b93556d8526b8f52d5a371ffff7fd",
+   "testharness"
+  ],
+  "content-security-policy/script-src/worker-script-src.sub.html": [
+   "fe5bbb4adbe86a4b9bde7a645ea1379a4727c9c2",
+   "testharness"
+  ],
+  "content-security-policy/script-src/worker-set-timeout-blocked.sub.html": [
+   "30daa6c42351724a09ba60028ce2558d688c3555",
+   "testharness"
+  ],
   "content-security-policy/securitypolicyviolation/blockeduri-eval.html": [
    "01d4ce834d175d13eb0d9c80bbe4a7be614d687f",
    "testharness"
@@ -414164,6 +413078,42 @@
    "6e15d48ddd21d1bbb9603081d5d7fef98ebfa106",
    "support"
   ],
+  "content-security-policy/style-src/injected-inline-style-allowed.sub.html": [
+   "21c754d2fa97293bd6c0348be86c0cd2b8bf8654",
+   "testharness"
+  ],
+  "content-security-policy/style-src/injected-inline-style-blocked.sub.html": [
+   "a67ebb156e4ed0be8fd0ba7cf736a024bd85409b",
+   "testharness"
+  ],
+  "content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html": [
+   "23fd52d6753a3617938bc493f2267528b5cb576d",
+   "testharness"
+  ],
+  "content-security-policy/style-src/inline-style-allowed.sub.html": [
+   "9611bca6560ec98a3c46e363f0f4a42a3c752b61",
+   "testharness"
+  ],
+  "content-security-policy/style-src/inline-style-attribute-allowed.sub.html": [
+   "25223c678829295e6e3dbe981cd545af9101f9ef",
+   "testharness"
+  ],
+  "content-security-policy/style-src/inline-style-attribute-blocked.sub.html": [
+   "df54ea6b657c934698234a13bf9036c5399fa89f",
+   "testharness"
+  ],
+  "content-security-policy/style-src/inline-style-attribute-on-html.sub.html": [
+   "41573b06b842ccccc2661e4f673cfeec5ee17c38",
+   "testharness"
+  ],
+  "content-security-policy/style-src/inline-style-blocked.sub.html": [
+   "c3b2ae30212bf87e906c07989145f169f5cea41d",
+   "testharness"
+  ],
+  "content-security-policy/style-src/resources/allowed.css": [
+   "1d45524530e090f083dec62089cf95c19bb4d020",
+   "support"
+  ],
   "content-security-policy/style-src/resources/style-src-import.sub.css": [
    "37de4f39b0399d9a5a230b5446883f9e4b49a061",
    "support"
@@ -414176,6 +413126,14 @@
    "e639d89f22a1f3774cd87fcea9f5dd441e9520f9",
    "support"
   ],
+  "content-security-policy/style-src/style-allowed.sub.html": [
+   "2e149f54caccc53ac82a836f6838030ce8efe502",
+   "testharness"
+  ],
+  "content-security-policy/style-src/style-blocked.sub.html": [
+   "ed44a8d3392eff2e963e33dda1d02d1f0d307c81",
+   "testharness"
+  ],
   "content-security-policy/style-src/style-src-error-event-fires.html": [
    "64e5e823b50f71023f0520da16147fe0e2ba1b84",
    "testharness"
@@ -414268,6 +413226,30 @@
    "a46cfc14f19813fc3b71928dd4b9d459f318b035",
    "testharness"
   ],
+  "content-security-policy/style-src/stylehash-allowed.sub.html": [
+   "c4559f5096406228431e98d12eeb40664e32d588",
+   "testharness"
+  ],
+  "content-security-policy/style-src/stylehash-basic-blocked.sub.html": [
+   "0570c3f5938fafa702517f93a5f1ac08ec2efb17",
+   "testharness"
+  ],
+  "content-security-policy/style-src/stylehash-default-src.sub.html": [
+   "3ce6f0e52f10c66ce97928f865d1e5ee91a97bd3",
+   "testharness"
+  ],
+  "content-security-policy/style-src/stylenonce-allowed.sub.html": [
+   "2a9c8fd15faac9ddd4c16a5fee79f15266558b6d",
+   "testharness"
+  ],
+  "content-security-policy/style-src/stylenonce-blocked.sub.html": [
+   "e9b7204c818b62c7e1cfd06742f6c77c62b11764",
+   "testharness"
+  ],
+  "content-security-policy/style-src/support/inject-style.js": [
+   "a48eb434aa6fe0d0a4f664c55e68be03ccd902ed",
+   "support"
+  ],
   "content-security-policy/support/alert-pass.js": [
    "9d9311651dff245f3c45fca59bacac7804a48746",
    "support"
@@ -414277,7 +413259,11 @@
    "support"
   ],
   "content-security-policy/support/checkReport.sub.js": [
-   "90f36e63c4a18b6d755fda05b4e126e0cabf0e94",
+   "50b8b274a0a846ad527c2a369ba870def28e45e6",
+   "support"
+  ],
+  "content-security-policy/support/document-write-alert-fail.js": [
+   "55f9e74adccef83969d5da859a05bf670f711671",
    "support"
   ],
   "content-security-policy/support/echo-policy.py": [
@@ -414316,6 +413302,10 @@
    "b10c13ac32450d15761f99a5096e1a3deda0e9bc",
    "support"
   ],
+  "content-security-policy/support/manifest.json": [
+   "f28fa5977ae8aa5da1b517ee7d63841378efa328",
+   "support"
+  ],
   "content-security-policy/support/media/flash.swf": [
    "53203da2c93399cdc4c3355a60d098c203cc7c85",
    "support"
@@ -414373,7 +413363,7 @@
    "testharness"
   ],
   "content-security-policy/svg/scripted.svg": [
-   "e5a26ca493e75cb4245e9f0de986cde3ab697d62",
+   "56dab4b05aa8b2872ff03d56e371f3f814457fe1",
    "support"
   ],
   "content-security-policy/svg/scripted.svg.sub.headers": [
@@ -414381,17 +413371,13 @@
    "support"
   ],
   "content-security-policy/svg/svg-from-guid.html": [
-   "e5f4233841d1b1688d48e66a0efd65b940d45b02",
+   "850ac0d015bc3cc0fadc7047d87938e937e3c89b",
    "testharness"
   ],
   "content-security-policy/svg/svg-inline.sub.html": [
-   "699d329c0929525b899e5ecc848ea0eff4ad02b8",
+   "9ef364019d2e2822a44cde9d07bf71ae36ff92eb",
    "testharness"
   ],
-  "content-security-policy/svg/svg-inline.sub.html.sub.headers": [
-   "8804cfb21823324551f0f98977ecb80588099150",
-   "support"
-  ],
   "content-security-policy/svg/svg-policy-resource-doc-includes.html": [
    "474d542398a46e302add6494151628a1e6e144e1",
    "testharness"
@@ -414400,6 +413386,46 @@
    "3cb51cc3be98ab648a58c858727e749bfdf53424",
    "testharness"
   ],
+  "content-security-policy/unsafe-eval/eval-allowed.sub.html": [
+   "d93f0e1c1e4f0950e8b12c697c9da72ac2b2aec6",
+   "testharness"
+  ],
+  "content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html": [
+   "b3e5cff5c8e5b0a661c07091b45be3503409735f",
+   "testharness"
+  ],
+  "content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.sub.html": [
+   "93b24c21d60b4d4e5dda7f1c176979b342150d68",
+   "testharness"
+  ],
+  "content-security-policy/unsafe-eval/eval-blocked.sub.html": [
+   "b3d1e79feadcd00ae5654a33c385ee6f64e327cd",
+   "testharness"
+  ],
+  "content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html": [
+   "e79159c061aea45d3562f38180f735f2a7af5718",
+   "testharness"
+  ],
+  "content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html": [
+   "4622816714f1debe7297a9bab294e607096639d7",
+   "testharness"
+  ],
+  "content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html": [
+   "b055b17777b69f9e332eb28c6e62bd585e270f53",
+   "testharness"
+  ],
+  "content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html": [
+   "2e9c470be9571e750b2b4324d52da7b7aadc3dd2",
+   "testharness"
+  ],
+  "content-security-policy/unsafe-eval/function-constructor-allowed.sub.html": [
+   "09e8b9e1a381f9c5aa5bbb77545be6d174978735",
+   "testharness"
+  ],
+  "content-security-policy/unsafe-eval/function-constructor-blocked.sub.html": [
+   "2676e375c60899dbd2281b49e01e82e1b3d9451e",
+   "testharness"
+  ],
   "content-security-policy/unsafe-hashed-attributes/script_event_handlers_allowed.html": [
    "3dac897440d3bcca283c606c51d23a9d37c66a62",
    "testharness"
@@ -482473,11 +481499,11 @@
    "testharness"
   ],
   "css/css-flexbox-1/percentage-heights-000.html": [
-   "fbb795af85abb6bb28a2c3ac94012aad7e99b45b",
+   "9f5db2023fe4ac61108546602a5cdd2fe6ad8203",
    "testharness"
   ],
   "css/css-flexbox-1/percentage-heights-001.html": [
-   "5c3c576ee34a20e61e33a9851d332c743a9f078a",
+   "0bc00907610df6c5e03b884bf1a5633d80eff38b",
    "testharness"
   ],
   "css/css-flexbox-1/percentage-heights-002-ref.html": [
@@ -482497,19 +481523,19 @@
    "reftest"
   ],
   "css/css-flexbox-1/position-absolute-001.html": [
-   "bcf0ce321b9aca0fba213f677e9db92d595175fc",
+   "1c12d945aaece1a3c7c9e6b4b9986d5351956c4c",
    "testharness"
   ],
   "css/css-flexbox-1/position-absolute-002.html": [
-   "459087f00f8417a3345f0bfc25b6d66d44364a5f",
+   "f8b0ae2faf24d6810e3936307cd34a0b246fb3a8",
    "testharness"
   ],
   "css/css-flexbox-1/position-absolute-003.html": [
-   "25d21bf70a43936b159001b9a405e9df65e0f222",
+   "d1982c9167f9e73848b96722392b6c7e8ca7372e",
    "testharness"
   ],
   "css/css-flexbox-1/position-absolute-004.html": [
-   "222c04822ec756d6f4f504ed507aa678c7960b75",
+   "42bf61d230422676bcf0e2bae1f7dffee1ba340f",
    "testharness"
   ],
   "css/css-flexbox-1/position-absolute-005-ref.html": [
@@ -482728,10 +481754,6 @@
    "461fd17b274662b88500cdf42bab7f3b79e6019d",
    "support"
   ],
-  "css/css-flexbox-1/support/check-layout-th.js": [
-   "a9d8444db24ab38518f07a965a8a537cc6add437",
-   "support"
-  ],
   "css/css-flexbox-1/support/flexbox.css": [
    "1ed29ddf429bf5efe54b65ce8b66d59c8c23a5f1",
    "support"
@@ -483160,6 +482182,122 @@
    "7b4cb600b9df97cd022504c4541b2143af22d29f",
    "reftest"
   ],
+  "css/css-fonts-3/font-stretch-01.html": [
+   "81f846d3cb087fb1a84f534a04320e706b49a212",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-02.html": [
+   "86cd31128a1051e607015e9dadc1b78fea553b47",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-03.html": [
+   "89b7d76992c5ade46281384971c7b933f9c13669",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-04.html": [
+   "d2f26924c10a7ef4754babe06ccd050bda9332b8",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-05.html": [
+   "bfd111699b5553f84522bbfb84ca49c177967ed4",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-06.html": [
+   "fe90f418ab95706b0ec0110d545a8707773935fb",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-07.html": [
+   "6fc64aada50f8fc8b1525cdf8917050c4d062b43",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-08.html": [
+   "c113be451ff508c83cbc3ed589b721c23a5c3e92",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-09.html": [
+   "67e3ce27e575d7bebbe090e20f8cac651da1e803",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-10.html": [
+   "1d7c21ba01880a024511102488f199283e777dbd",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-11.html": [
+   "fdfa62d43cec5c4e98af04f7791ffdbbc9efde87",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-12.html": [
+   "fff585669f5c2fa963613c1679c5020729daa66e",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-13.html": [
+   "50322d78f923052e51034ec80c5b1dd44ca618be",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-14.html": [
+   "c4e2815ef769546c745a6fbebeb4db05e102a2ef",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-15.html": [
+   "004e1a669c3cb3d3301c02ef84bc59d6af0f7238",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-16.html": [
+   "cb06cd30d8d111217e940d8de85ccf6fcf2a0a77",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-17.html": [
+   "86f077b63e2a7ba6f60965c87c30b1ac94f3cee0",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-18.html": [
+   "035d0f522d507efcdaf259b6fb99baeac9251766",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-stretch-pass-ref.html": [
+   "33a2a751324acb824907eac5853a91f96a3bd86f",
+   "support"
+  ],
+  "css/css-fonts-3/font-synthesis-01-ref.html": [
+   "4b02221e4811f2041c03698237c71e84173033b4",
+   "support"
+  ],
+  "css/css-fonts-3/font-synthesis-01.html": [
+   "df13a99fc3916de93cbd8b92f8520393ebffccd0",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-synthesis-02-ref.html": [
+   "37caa18f5f1f4a76da775b6618fc9a4edbb7e6da",
+   "support"
+  ],
+  "css/css-fonts-3/font-synthesis-02.html": [
+   "295747b4f9cf02154f3daae95ab8bbab75ccb386",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-synthesis-03-ref.html": [
+   "521b4dbd1ba6cecce7349080c1c757bb19a984f8",
+   "support"
+  ],
+  "css/css-fonts-3/font-synthesis-03.html": [
+   "46f41bdaf44ced16707fb01f598fe83acab3b8c6",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-synthesis-04-ref.html": [
+   "37ae6d66d5ff56b42963bb749c0ba3c51800b1e9",
+   "support"
+  ],
+  "css/css-fonts-3/font-synthesis-04.html": [
+   "43e1f2bfa2e74cd9ba489f3ca4f156907fb7cb6c",
+   "reftest"
+  ],
+  "css/css-fonts-3/font-synthesis-05-ref.html": [
+   "7c54b978bb6beb1c5e6c145c0adce7eb62c5efae",
+   "support"
+  ],
+  "css/css-fonts-3/font-synthesis-05.html": [
+   "b46ea0f9864807dd0f36f90ff7668d5f733dd326",
+   "reftest"
+  ],
   "css/css-fonts-3/font-variant-01-ref.html": [
    "996de9843a58617c022174e77c6420816087dbe9",
    "support"
@@ -483681,16 +482819,16 @@
    "support"
   ],
   "css/css-fonts-3/font-variant-position-02.html": [
-   "1f0130c363d56c078dc7bb72906a89245d352226",
-   "reftest"
+   "831af35c0ac730263a3061c3052e865bf719997c",
+   "visual"
   ],
   "css/css-fonts-3/font-variant-position-03-ref.html": [
    "21f6fd83c6b63b57c75a43f08023bb6b3c6f8a87",
    "support"
   ],
   "css/css-fonts-3/font-variant-position-03.html": [
-   "777fca83be2a37bca768fde84d3226448662c181",
-   "reftest"
+   "7ad4b9d97ada6410e4e2c92b217d2aaa1317946c",
+   "visual"
   ],
   "css/css-fonts-3/font-variant-position-ref.html": [
    "986683fda8ba407d03e9d5e385ad4083b8ee6862",
@@ -483824,6 +482962,22 @@
    "f4f2fdd3f411fca8cd03b1f7f737694c73c0220b",
    "support"
   ],
+  "css/css-fonts-3/support/fonts/Exo-DemiBold.otf": [
+   "a239ac3082ff3c19edef8461a5ab9b778361f7b4",
+   "support"
+  ],
+  "css/css-fonts-3/support/fonts/Exo2-SemiBold.otf": [
+   "b1d02e8b1ee47bb1d200e81742876fce74b92436",
+   "support"
+  ],
+  "css/css-fonts-3/support/fonts/Exo2-SemiBoldCondensed.otf": [
+   "a4b11be0affd64e9f927095e3bc3653544d827d2",
+   "support"
+  ],
+  "css/css-fonts-3/support/fonts/Exo2-SemiBoldExpanded.otf": [
+   "60d232dc51a04464558ebe3680304c250d1e2ecd",
+   "support"
+  ],
   "css/css-fonts-3/support/fonts/FontWithFancyFeatures.otf": [
    "ce1bc123ba75345ab3816af7c18b481badbfd5eb",
    "support"
@@ -483852,6 +483006,10 @@
    "3d219e370db37a3392e07eb0c804d10ca7caf9c9",
    "support"
   ],
+  "css/css-fonts-3/support/fonts/fail.woff": [
+   "69e4080710f24b062203f56aa6ae2d991d4fa19a",
+   "support"
+  ],
   "css/css-fonts-3/support/fonts/font-feature-settings-rendering-2-expected.html": [
    "883083cdde66caca05384d3d6930070454e94fad",
    "support"
@@ -489652,6 +488810,10 @@
    "085a994b4b934056d0811cc989727e6390c37d66",
    "support"
   ],
+  "css/css-fonts-3/support/fonts/pass.woff": [
+   "cd8655ca01c5579a273f2063174a01126b10b78c",
+   "support"
+  ],
   "css/css-fonts-3/support/green15x15.png": [
    "de1830c21195763f7327f270b14b6d50dfdfb21d",
    "support"
@@ -489793,11 +488955,11 @@
    "testharness"
   ],
   "css/css-fonts-3/test_font_family_parsing.html": [
-   "fa926a9e86823cddea6d9f1418c752cf04e341ad",
+   "0aaa1c1bb9497df1cddbeda60f7d522568dc2f01",
    "testharness"
   ],
   "css/css-fonts-3/test_font_feature_values_parsing.html": [
-   "26fc2e6d6a0b09a93a8fa08aed87ea9cdd13c404",
+   "a6397508316c35300513830a7a53d882debe3829",
    "testharness"
   ],
   "css/css-gcpm-3/OWNERS": [
@@ -489901,15 +489063,15 @@
    "reftest"
   ],
   "css/css-grid-1/abspos/absolute-positioning-definite-sizes-001.html": [
-   "884098260e1c51873c90d8328e31973f69adb224",
+   "8d917ad490835e4248956865571e3c4762973d0b",
    "testharness"
   ],
   "css/css-grid-1/abspos/absolute-positioning-grid-container-containing-block-001.html": [
-   "d7a6d2f0196a3e1e7b9bd618a1f885ae58dd05fb",
+   "ae306e9e6e980d4a575d6d10cee6401379283014",
    "testharness"
   ],
   "css/css-grid-1/abspos/absolute-positioning-grid-container-parent-001.html": [
-   "a7d866aed9b5021e681dadb85eca50462db1d748",
+   "b64d2b6f87d105d4631b7c539ed451e598d9a0f1",
    "testharness"
   ],
   "css/css-grid-1/abspos/grid-item-absolute-positioning-dynamic-001.html": [
@@ -489953,43 +489115,43 @@
    "reftest"
   ],
   "css/css-grid-1/abspos/grid-positioned-items-content-alignment-001.html": [
-   "dc376db419836c1fb2cc0d0477b20454159813e9",
+   "53c8139254cd0f62abf20b434132cd6ffa04be0f",
    "testharness"
   ],
   "css/css-grid-1/abspos/grid-positioned-items-content-alignment-rtl-001.html": [
-   "4530ed56a6b6b37d876cb9e56d73718440560f7f",
+   "566dcee47358c1e490786d0a8b995e4dbc11f076",
    "testharness"
   ],
   "css/css-grid-1/abspos/grid-positioned-items-gaps-001.html": [
-   "09614159f2996973a825a574ce884679aff69283",
+   "490d474f560501ede900e5cf448b0dc9dc9fa116",
    "testharness"
   ],
   "css/css-grid-1/abspos/grid-positioned-items-gaps-rtl-001.html": [
-   "b92090cc95a982097b54ba0695c4b0b43fb26b5e",
+   "8666f9bcaca645602fc2e790db2ab4cc7a28af5c",
    "testharness"
   ],
   "css/css-grid-1/abspos/grid-positioned-items-implicit-grid-001.html": [
-   "41cc2addf301921ffef0c1b98fb34ab41af059c6",
+   "eb058474779ddb8e4a31546fc2d89126a562e465",
    "testharness"
   ],
   "css/css-grid-1/abspos/grid-positioned-items-implicit-grid-line-001.html": [
-   "7e1f3ea3a2db26462048f2614725c8467095e934",
+   "d0e71cc3e8fce7329982eb37c1c1747fc62fce9e",
    "testharness"
   ],
   "css/css-grid-1/abspos/grid-positioned-items-padding-001.html": [
-   "024ababa5af46ec7fe3195ecbb2af5a7d1aab075",
+   "b4c31742faf89abbfd22fec978c77ba0836d7f03",
    "testharness"
   ],
   "css/css-grid-1/abspos/grid-positioned-items-unknown-named-grid-line-001.html": [
-   "a0a24530691fd19fc07986657375033c1d7eb524",
+   "e33299485785ec3ae16b7fd9b727c651ce5c2a8e",
    "testharness"
   ],
   "css/css-grid-1/abspos/grid-positioned-items-within-grid-implicit-track-001.html": [
-   "36d607db41c6cd74eb66859e550cfd339d3cd6f8",
+   "6ca9c08237d698a8f29ab04dc0cae117b04d7c02",
    "testharness"
   ],
   "css/css-grid-1/abspos/grid-sizing-positioned-items-001.html": [
-   "44c77a955845c78f581e039f78364a8caed6a6c1",
+   "9389a43ede1cdadda820a5db21cb08cf25b4f9b9",
    "testharness"
   ],
   "css/css-grid-1/abspos/orthogonal-positioned-grid-items-001-ref.html": [
@@ -490233,11 +489395,11 @@
    "reftest"
   ],
   "css/css-grid-1/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html": [
-   "f042dd8f7e7c4d228ef9f1a7eae641899f516940",
+   "20fce922797d8d29a3301d90d0113f659827b1a8",
    "testharness"
   ],
   "css/css-grid-1/abspos/positioned-grid-items-should-not-take-up-space-001.html": [
-   "2d6dec61a1a2902a58f50b3b8e1330c97ce547b9",
+   "171c6bbf8b1126781f71b60774e9d01ba7588cc7",
    "testharness"
   ],
   "css/css-grid-1/abspos/positioned-grid-items-sizing-001-ref.html": [
@@ -490249,147 +489411,147 @@
    "reftest"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-001.html": [
-   "19ae01ab31a15efc601d2857d3ca1dd879cb4e66",
+   "99d3941d430705202a7094276de59dc5edf69321",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-002.html": [
-   "abb8f221910dc58b87ff1d3f5b9f346994688a8d",
+   "399c23ecc22e3ab5376044847fdcc0e778bc0bad",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-003.html": [
-   "1dee7406f817681eaec5c1b5607b9762bc546329",
+   "bcdc1d68ddff37c67204341a6e93dc81a325a8f2",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-004.html": [
-   "03da21bdcbb4fdb53f93c372da2af4a175fc0bc9",
+   "163ebbb7c462f803de9f85fbde11a384847f4faf",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-005.html": [
-   "c4e793351e05b74a9d859286407f30f019e581ee",
+   "0e759ebbad7f7de553ebd8ccc50892d3af40d9eb",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-006.html": [
-   "ab2604e1dd0396402ce6ab0acea3a340d107ad08",
+   "106f9a163e1d1621827e1d34bf1cc0c043b01898",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-007.html": [
-   "17b0c72f106d9103af25c654e913ad00c2a5ee19",
+   "247606b98201e9a73f6162432ec4f032e7822d98",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-008.html": [
-   "32b50873af5b434817de9ca3fb5ea3b79808bdbc",
+   "ce14fc5adc6e6bc08f9d67f7c432e42e1fa06994",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-009.html": [
-   "29551eeae983adc5cdd9b518b64a1d0c9560f062",
+   "78f5c7dc3382ef9e06cb98266a1aea04858b36a8",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-010.html": [
-   "396afc15a311bb0a636ba2570b57366a52fbc770",
+   "572eaddac3bcad2a78f595a2d7252ed61e284173",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-011.html": [
-   "49109ff240399f0f1f60308850f805779dfc4b21",
+   "70681816b62b12c0b47dd59e92c82c57c5195df4",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-012.html": [
-   "45a9279c62d4052a150a6da13ae9c177a38f01a2",
+   "45434202efd7954308d6f87023cdbc245a412c47",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-013.html": [
-   "29d4695a9ad8eb5eebcdf15b3693a714bc412779",
+   "93ae6b0da898b80b39b7c3315b862024345625bd",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-014.html": [
-   "66d7b70d305869abb453caf2f0e51a274bd1a537",
+   "439df61ce437200c65c09605d46461f889b0c236",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-015.html": [
-   "874f6b55e6b204d6cfc41c73a2c00a5f4229d298",
+   "4944467ea75bbd7468f08ede5dd19a88196ab9d3",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-016.html": [
-   "51b59909bd41adefa471e9b8bf9ff75e9ed92259",
+   "e0b7eeddc7cdd5187c3a07186407360026b6a0d4",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-017.html": [
-   "6423406f9bfaf43ac97fd4547a784c2bb8d19bc0",
+   "47d65e49c206a554caa1738e44f0d41f2650431a",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-018.html": [
-   "123575acf3c090c6479e5e4fa064c75fcea56bda",
+   "08367b30d4b332dcff0be6f7967c1dc8ef4bd9af",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-019.html": [
-   "f611e34104ae873f1124032aa22621dfcf4fa128",
+   "f357a479479fb871c6e6eeb49ac028db55757d81",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-020.html": [
-   "c0a3bf24655a77c05dce301b0173f18d0fa42234",
+   "4271df1342f4600e39f6ec3b1daae20ff369a5a8",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-021.html": [
-   "e39bd0c869b5c69f99ddb0e43ecd516c23e22051",
+   "c72cbc118d7af2378cc2026ccd4eff5b2b3dada3",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-022.html": [
-   "436855cb48c5de8f913f209ba8172644c0e97226",
+   "d1bcda40064849f8250ca423c07210ef6f7135da",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-023.html": [
-   "07ea8b43529cc3abe597b5cbaf71b577c0e08a81",
+   "5ffaf7fb23cd317c684633b26ce027beb83aef20",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-024.html": [
-   "4ef7fd0b4687fe9f08513cccff2707bb05d92a78",
+   "7c475cebcd650192507dadee416e5e5a7318f0f9",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-025.html": [
-   "4ecabe7266535153ce6e38e1bee6e4eba28c5260",
+   "b5100c40529365ed36531bfca7310370f3cd017f",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-026.html": [
-   "dc702a1d181ef4efcf4d5161ff1b10bbb8e08337",
+   "1e8a5e7c21da8a8197b2d35943d2c4a67050c583",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-027.html": [
-   "a5646db94e62b9455c9ed44e9f1a86f1cda74153",
+   "1e87d9f38001a7a1407ee6983c3a4f7b1dc8da92",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-028.html": [
-   "9940f6e83d28a45ad87a50b24afe5eca1c3ff596",
+   "a8d71f02f9233d070eb99cf3f7d9c9e69995c570",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-029.html": [
-   "ed6197207c84d52614f2e4bda31aa0794ac244ce",
+   "cd4207c50b24057e84f52e2df9ee40df0bc1e490",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-030.html": [
-   "df920f26e14d9adb3e987771b74f3ca21d001b9d",
+   "9fe22b9a8a575ad8176f3a657a9b9ddfe71a7753",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-031.html": [
-   "24cdde781a98046593d3f0a57906b756326c4d83",
+   "082342d57257892308c3909c8ca4c3b270021551",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-032.html": [
-   "489c89b0d82b3ad92e342db2b680b152e4bab404",
+   "8eb6d46e01bbc2383198ff4d906ce1c8053dd56d",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-033.html": [
-   "4905906bd110e7b9ef3ad1ca4e0b01417b0998c8",
+   "151c7aebb20d2fe130351503641fdf200bfc1d3f",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-034.html": [
-   "c9ef480494c982efd2cc2b6801eb0c308de0a608",
+   "d06920746566a28b934d301107b73e1d54c1aba5",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-035.html": [
-   "f93f4f2a62aa2073676466dcfc5975556dd04739",
+   "d747922cd9b2711dff260de987a0242ea6989235",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-alignment-implies-size-change-036.html": [
-   "748d617dac4b7c97592967c0df1ee82f6a43cc0a",
+   "4739f523e02112bb7dd6638dc5b986d1d7bce44f",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-content-distribution-001.html": [
@@ -490589,199 +489751,199 @@
    "reftest"
   ],
   "css/css-grid-1/alignment/grid-fit-content-tracks-dont-stretch-001.html": [
-   "9fbe55ecef2ac64d864d6592cb9b81198acac261",
+   "04b805be2d4db49e730ec64ade4af951c510ad97",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-001.html": [
-   "faa0a4a8e6660d8bb12cec2ccbe86e8e23bcc936",
+   "917e0b3e2c98cface73510fb00b62e609ea94ecc",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-002.html": [
-   "735b425c34d147a32b97e60606a5d088389fecfc",
+   "a32fc988586c078db1c437a81a3a7b2fab2e921f",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-003.html": [
-   "7f5a41bc81b97bb4b62e55b69fa1ecfe241edaed",
+   "79346c92de73ab8e88c9ea86c963b99ec437854a",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-004.html": [
-   "0e12bf8b99c417c9176100f7b945b9a83d53f69c",
+   "5a02e719fc6d65cddd2dd97c2aedfbea1b0d7eae",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-005.html": [
-   "d28606de466e787ac8e4c1f742806c2bbf570a88",
+   "a33ab3b46bd68238bcafc86350f1bee36fb78373",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-006.html": [
-   "2ea3e018bf73940231af89dc72c2352fe2985732",
+   "61c927b4280011667fea7869eb82071d29dd2207",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-007.html": [
-   "d2ff7e0efbb1240bfa4b21b0d2e7eb0891950348",
+   "35a0411b69e1ee32e00b2894db7eb1e1e173cb15",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-008.html": [
-   "0ee2f7d1f4bed6383a762f86efa6dc2a8a27bf4b",
+   "fc0e18c677cbae1dab7bb55688fb60da6de0ff1e",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-009.html": [
-   "d64052253097bade696ff9c8bee42bfa8cca9604",
+   "9e836b1cbc598eaf29f40fa783ac1666441131a0",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-010.html": [
-   "9523288742cb15e2451b41b85596ff868b6b4648",
+   "8168c74fc8ea39b72e7327685231aa91a6985ceb",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-011.html": [
-   "9929a38f502a2e82ae93b6a39910eacb04ee6e58",
+   "e6bd704502d9dbe6ac453d92ebf7f61d5ec5805a",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-012.html": [
-   "9a19df31cfded6c4270da40070c3e8390c8366b2",
+   "618b7bbae71741c700534d8c5dcf7b471cccd52b",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-013.html": [
-   "a8cb352297f011b42b3740fd73f2f78f0bdca29d",
+   "4588a246fa623f272000d7d2ca95ff9413fa7ce2",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-014.html": [
-   "11e3cb854d0c9fb7535a7408a56e9f372acf7b74",
+   "eb5bf50d24837a38d7f1f70508030c0d83e22dfd",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-015.html": [
-   "7b145fe80d78b51f42f1a257e64b77f256324029",
+   "af43ff2ee5ea8f4bfc8eaca775f30bc56fce2429",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-016.html": [
-   "3d7b17fa76b3f21ccd882072158f25c723698b24",
+   "d7d3dd523cc6897b701b57dfdb41c13e93209eb2",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-001.html": [
-   "613da8787ea601c01cd79348e68d94cbdf4f6c12",
+   "a541ceec457d826677469e1dde2f2fbdbc3f7448",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-002.html": [
-   "bfbfeef9485cd0a842729d72ae6a7d2978fed0ee",
+   "8ee1d02283ddd96ab042e10f31e02d19998ee1f3",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-003.html": [
-   "47f8fa7e366a0928a1ef6ee30d3e97898d10b882",
+   "a2039c7a3a995613595375b8dbd6f0a4d6eee077",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-004.html": [
-   "0277d86138e1e5aecea0fcde768a48a8b841046c",
+   "6c24f14a89c33bc7813274c0818dc0842e9c1e83",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-005.html": [
-   "b82ead09258f8746f6c7d4d9fd363b2bdfe2fe42",
+   "c7b147c20408781c3e3998f867a5878916960ed5",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-006.html": [
-   "290d852faea189b602457356f6abf8df51f4e306",
+   "0cca9ab651aadb24b3fa17c2d991f8498aae49ec",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-007.html": [
-   "f8418fe79ca641e453791ca1c202cdad50220b2e",
+   "8552960b768a80146861772e61c5ba66f49b2c59",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-008.html": [
-   "10e77671b9a37de05f4898e035aa29fde999f64c",
+   "81be158b4ee68340a69586369ddfe38e2e4a5eb4",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-009.html": [
-   "9f7f821d8fd60bf5ab47f5341a3a103afe94d3a8",
+   "067c428854205595ea4cb7bd94e4cd331428949e",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-010.html": [
-   "f5327de3394428415fed804e4e79efc0fe963817",
+   "b53540415c065d41bf22d0d6f49708b5216695fb",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-011.html": [
-   "a7aac5da4c4e085b14c77a0088a4d608c637f9bc",
+   "b6078329294d7b7a26722e0e9e82171cb250607f",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-012.html": [
-   "b35ad113f09d62cb40cf4a16ff6faca82d73de35",
+   "55db10daf6be8aa2a75be718929bb0137ec668a7",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-013.html": [
-   "5e97e65254d39476e883cb847d421a54496c71a8",
+   "84d9d4a608a03d5ef129abe2526b6fa55668492b",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-014.html": [
-   "cf7374a5f900e4d6a675dc32a9181cfd1653075d",
+   "bbfe2d5190c6c4bcb208ec6f25990d52f75b7134",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-015.html": [
-   "1ebbfc6564b9c8350fa618bea97ecab3fb44eade",
+   "f4dc41a4ce328418c9f572074f7b881104c805b2",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-016.html": [
-   "74711c54c4c2148895e75132d9cebc225a9128a2",
+   "448d66b5757cb939fc9a3f03680ab1b9b8825ec3",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-001.html": [
-   "a4d4dec0f3fb7f490c2e046d535d8f86a89ec519",
+   "ffe1ef9427e3847e89a0f59f5637bf94e80ca4f7",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-002.html": [
-   "2ab21074fa42c487f294866c39859e06364715de",
+   "99cee6353da618a175033a2dbdb49315024ec083",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-003.html": [
-   "695ee5fa198c111a3f8dcee1520938878b003410",
+   "327f6d87554010b433b90ae0363814d935398b23",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-004.html": [
-   "6625c4aa82c02c86075a49d0485160b24f5ed5b6",
+   "9941214f81451e89e231d4e979ef21fae2d73cbb",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-005.html": [
-   "5c400ff43392287f0203102c100ae1d286286e94",
+   "143ca0175c875529c74b9fd9a1cc2fe2067386ca",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-006.html": [
-   "5c4f715f864ee0718a28cd56aef5bb63549042da",
+   "8d2a905743959c7a2f227f187286e3cb23f39e59",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-007.html": [
-   "82b67b0f255a36275c9e2179f7c0a6c194b80881",
+   "6574fa2ea2a9776689367c4f64edaf5c8c844736",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-008.html": [
-   "df9a693d3d6a7ecfb8767b1e53af0f71b54e4cac",
+   "f201af5919cc79fa8a3834900048c7fe2a794a72",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-009.html": [
-   "9223ee50b9c22c737e42f113e67418c3b9f42312",
+   "59047d7646baef9aac63ed8c130030bc4725c780",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-010.html": [
-   "065d965da5145e629517941de214c53a990e7d04",
+   "60d4108239c5ca52d7998f8b1882dd7adf38b567",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-011.html": [
-   "819fb3899679610911df95110f051973ef4fcbb6",
+   "9c868b3e52a6604a9ee810a58f811fae92a48fa1",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-012.html": [
-   "52459738d7455d7ed97045aea124b2160d37643a",
+   "87e41d80af965f86f5d43a9594cc324e1b365d9b",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-013.html": [
-   "09be06f107f5ea97fc6db45b8bca150e10dc7296",
+   "cbc79b5b2b117ed2e1e286c91e6ce92b57d3112a",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-014.html": [
-   "0270a89bde2e54d3108d8ab8b8dbb3f64ae855af",
+   "526ea2640f2fc150bd90f1eb7552686d39437906",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-015.html": [
-   "f49ae99abd185af7bc9937c16bb7f4bb2044bdc6",
+   "9c97198c58873215469e20469219fa29197ba2b3",
    "testharness"
   ],
   "css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-016.html": [
-   "86d478dee444129ccd10f76aed6d80c75251ff13",
+   "a60c43c1c32b908c3df899f3cba0ddf1c0fb0824",
    "testharness"
   ],
   "css/css-grid-1/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html": [
@@ -490840,6 +490002,10 @@
    "194031e276c1dfca4dd57bf5791a0cc1fd226a89",
    "reftest"
   ],
+  "css/css-grid-1/grid-definition/grid-change-fit-content-argument-001.html": [
+   "3bb5904f2a6c36b0575c395a3cc1b008e4cbcf0c",
+   "testharness"
+  ],
   "css/css-grid-1/grid-definition/grid-inline-support-flexible-lengths-001.html": [
    "99215a797996322c89105b8ca5cb426628ec7563",
    "testharness"
@@ -490900,10 +490066,26 @@
    "4cab09ffd97789ea2b5e571bfafc2ef6bc26e314",
    "testharness"
   ],
+  "css/css-grid-1/grid-definition/grid-template-columns-fit-content-001-ref.html": [
+   "518f7a0d17c565fda7903d1abfac794fbc03191d",
+   "support"
+  ],
+  "css/css-grid-1/grid-definition/grid-template-columns-fit-content-001.html": [
+   "64c4a2aef9e86f623fede6185ba1d6b4eaa2be17",
+   "reftest"
+  ],
   "css/css-grid-1/grid-definition/grid-template-columns-rows-resolved-values-001.html": [
    "e06c2099210cec1f7e031b3aa9901b675f0d2801",
    "testharness"
   ],
+  "css/css-grid-1/grid-definition/grid-template-rows-fit-content-001-ref.html": [
+   "8aa844e9ae3fb1f8b359b8dcc43bbf605bc726c4",
+   "support"
+  ],
+  "css/css-grid-1/grid-definition/grid-template-rows-fit-content-001.html": [
+   "a6ea0c0330b667d86c54933875e5cfda9d3f2162",
+   "reftest"
+  ],
   "css/css-grid-1/grid-definition/support/testing-utils.js": [
    "7d6dc5106777942ad83e6bc570368af113f32d5f",
    "support"
@@ -491268,6 +490450,10 @@
    "7ab628056a02368bf958038106c871318e5c56a0",
    "reftest"
   ],
+  "css/css-grid-1/grid-model/grid-box-sizing-001.html": [
+   "69eb267879e0b899efa996f4923414f72ecc52bf",
+   "testharness"
+  ],
   "css/css-grid-1/grid-model/grid-computed-value-display-floated-items-001.html": [
    "f94336e80a72225b05970dec330508c33445c87a",
    "testharness"
@@ -491384,6 +490570,10 @@
    "5873efcda9c17e48a8437a62bf6871cbf96bdc46",
    "reftest"
   ],
+  "css/css-grid-1/layout-algorithm/grid-stretch-respects-min-size-001.html": [
+   "5d6eb1efb1d1e52025ea4e8e2c8f758e08ca6c22",
+   "reftest"
+  ],
   "css/css-grid-1/placement/grid-layout-grid-span.html": [
    "d7767a1bbe0af424621e669376fc46fdd685af18",
    "reftest"
@@ -491464,10 +490654,6 @@
    "feb53485e24aeaf9a5f27be5e42cc4a6fc5b8df0",
    "support"
   ],
-  "css/css-grid-1/support/check-layout-th.js": [
-   "a9d8444db24ab38518f07a965a8a537cc6add437",
-   "support"
-  ],
   "css/css-grid-1/support/grid-alignment.css": [
    "b45aee51245613ceddf8eda70d995a26027671bd",
    "support"
@@ -491536,6 +490722,14 @@
    "a4ed2b29eef39f7ed54add4ab45807665022f5b8",
    "reftest"
   ],
+  "css/css-images-3/gradients-with-transparent-ref.html": [
+   "afaee81ac76599c859b267754920b9dc8df97ea9",
+   "support"
+  ],
+  "css/css-images-3/gradients-with-transparent.html": [
+   "4b49a6bc4cfef048f3a4ac1d62feeb604e0d28a5",
+   "reftest"
+  ],
   "css/css-images-3/image-fit-001.xht": [
    "868d9469f57e6013a024efa5e04ef2455d97296e",
    "visual"
@@ -498281,11 +497475,11 @@
    "testharness"
   ],
   "css/css-tables-3/fixed-layout-calc-width-001.html": [
-   "0b8262ca3abd6104e86c305d738a2c70f6cb1f87",
+   "df167ec3c296c684230a8be95c1411c2329b87d9",
    "testharness"
   ],
   "css/css-tables-3/fixed-layout-excess-width-distribution-001.html": [
-   "36b7b7893dba1f3ddc2edf46fee323d75e5af49d",
+   "d0cdc5a206aa1b70ece371ff65bfbfeac7adcb2f",
    "testharness"
   ],
   "css/css-tables-3/floats/floats-wrap-bfc-006b-ref.xht": [
@@ -498344,10 +497538,6 @@
    "abe7468e88cad3aef32c7e59fa4a33a7930ef53b",
    "support"
   ],
-  "css/css-tables-3/support/check-layout-th.js": [
-   "a9d8444db24ab38518f07a965a8a537cc6add437",
-   "support"
-  ],
   "css/css-tables-3/table-model-fixup-2.html": [
    "19e3577e862601a0cf00dd4644017218c363f0db",
    "testharness"
@@ -510977,11 +510167,19 @@
    "manual"
   ],
   "css/css-ui-3/cursor-auto-004.html": [
-   "9c4af5532976f37a86d7e05ae628b5aa8689fca0",
+   "8a92c094d77c263dfc9b7bcdc9ad75520d6bc234",
    "manual"
   ],
   "css/css-ui-3/cursor-auto-005.html": [
-   "a68a5b0fb98e906f04187fcf074f71bdaf306641",
+   "9817068737eee588792af57f0ce41d62287a6667",
+   "manual"
+  ],
+  "css/css-ui-3/cursor-auto-006.html": [
+   "41db488858f6149cf053f77c29af520ae890db30",
+   "manual"
+  ],
+  "css/css-ui-3/cursor-auto-007.html": [
+   "fd25eeafd686728595b97782249955418e0b912e",
    "manual"
   ],
   "css/css-ui-3/cursor-border-area.html": [
@@ -511045,7 +510243,7 @@
    "manual"
   ],
   "css/css-ui-3/cursor-image-006.html": [
-   "058d041acf503c96395a347c48497e77b465111d",
+   "abbcd623de110cf5974ee2a9a59b6b1c61125db4",
    "manual"
   ],
   "css/css-ui-3/cursor-image-007.html": [
@@ -520360,9 +519558,13 @@
    "ce8a97f7396acb9a7524274ee7a7de4f41024cc4",
    "reftest"
   ],
+  "css/css3-color/t44-currentcolor-inherited-c-ref.xht": [
+   "8164a5d275ce79f472e00e1a0998af65d8657a1d",
+   "support"
+  ],
   "css/css3-color/t44-currentcolor-inherited-c.xht": [
-   "a0d25a135ba0d9668ab012af3e82291c738a0a76",
-   "visual"
+   "87ea86999193bd7168011efbc0a195b1a988f0f5",
+   "reftest"
   ],
   "css/css3-color/t451-system-colors-a.xht": [
    "7faa76d4cba74222102a185c6fb5e46436a2dc9b",
@@ -522152,6 +521354,34 @@
    "53dc9a1f675b5212979fc2dc45afbefa0add6721",
    "reftest"
   ],
+  "css/filter-effects-1/parsing/color-interpolation-filters-parsing-invalid.html": [
+   "ef9797feb7854f7b5e664c3cdf86d6557b2491de",
+   "testharness"
+  ],
+  "css/filter-effects-1/parsing/color-interpolation-filters-parsing-valid.html": [
+   "02fe267b63babc73464297057da7e226cef472f4",
+   "testharness"
+  ],
+  "css/filter-effects-1/parsing/filter-parsing-invalid.html": [
+   "ed49a343fbf4ebffc7c98797b21bf6fed83d5f89",
+   "testharness"
+  ],
+  "css/filter-effects-1/parsing/filter-parsing-valid.html": [
+   "a53c5723d7f151f94b1ecbff1e4813beca40d546",
+   "testharness"
+  ],
+  "css/filter-effects-1/parsing/lighting-color-parsing-invalid.html": [
+   "b7f371c0bf3495c95bb230fa2e90f98d45060c52",
+   "testharness"
+  ],
+  "css/filter-effects-1/parsing/lighting-color-parsing-valid.html": [
+   "6ad4604f9d1f37befbf3db7ee71860400179675f",
+   "testharness"
+  ],
+  "css/filter-effects-1/parsing/resources/parsing-testcommon.js": [
+   "e1e3a86c14c73867a050311b8f69db2cc4764797",
+   "support"
+  ],
   "css/filter-effects-1/reference/filters-opacity-001-ref.html": [
    "a0ad8418d5df90156555c0402f4fc4262f42472a",
    "support"
@@ -531780,6 +531010,10 @@
    "82a6920db4d0be087e6ed621313ecf92e3e2ed68",
    "testharness"
   ],
+  "cssom-view/overscrollBehavior-manual.html": [
+   "ca369af991f1e1c34116f2effe0d53a806ed9df5",
+   "manual"
+  ],
   "cssom-view/resources/elementsFromPoint.js": [
    "0c31158817d4d6f9e59df0d2ebe0e41c6ce41bb5",
    "support"
@@ -531792,10 +531026,6 @@
    "0a8784c474ccdd4a3e76cb936855a8ef59566217",
    "support"
   ],
-  "cssom-view/scrollBoundaryBehavior-manual.html": [
-   "987051cdbad355cbb1bbb8ea1030a3b17e533f09",
-   "manual"
-  ],
   "cssom-view/scrollIntoView-shadow.html": [
    "3c4a18992105fd7bf19cbf29f0b6d80cb12ca98c",
    "testharness"
@@ -536441,7 +535671,7 @@
    "testharness"
   ],
   "encrypted-media/encrypted-media-default-feature-policy.https.sub.html": [
-   "aa376680149e53e4839dc48b45291264fa5d6960",
+   "a941d1f99d1575f7bd9448e7ce0d6d67f873a1ef",
    "testharness"
   ],
   "encrypted-media/idlharness.html": [
@@ -537220,6 +536450,10 @@
    "c697c5f11dec146f814d19472a8b94b0f50b1ae5",
    "support"
   ],
+  "fetch/api/basic/keepalive.html": [
+   "1ecdcb478b65b258e79242ae17af79ba903db412",
+   "testharness"
+  ],
   "fetch/api/basic/mode-no-cors-worker.html": [
    "39992b8abf3ab30182dfbaa5816cc154a22ae0ad",
    "testharness"
@@ -537764,6 +536998,10 @@
    "d839fec1d761688db807be2dfddf6b8b6932c46b",
    "testharness"
   ],
+  "fetch/api/request/request-keepalive.html": [
+   "e6c2afd6cef41d358016d4d021b7c3e0e1185704",
+   "testharness"
+  ],
   "fetch/api/request/request-structure.html": [
    "cc2471d809fcf7842c38762614c656bb45bb0fc7",
    "testharness"
@@ -537820,6 +537058,10 @@
    "c9ac2870a45253664da7de1aaf82626fdd1482bb",
    "support"
   ],
+  "fetch/api/resources/keepalive-iframe.html": [
+   "4bd91cabbc1bddb966320aa28b3caaa9d06a514d",
+   "support"
+  ],
   "fetch/api/resources/method.py": [
    "9ad4c5907e6fa4d8c4bca085f637af92db0f38f3",
    "support"
@@ -537829,7 +537071,7 @@
    "support"
   ],
   "fetch/api/resources/redirect.py": [
-   "387c35bf1e576f00a10ce5abb4cc92e78da56845",
+   "79c8b1bcad05e05a7b628edb22fdaedbdf2c3bc5",
    "support"
   ],
   "fetch/api/resources/script-with-header.py": [
@@ -538608,12 +537850,12 @@
    "b1349055762c7d44414c0c11fb8500d5eee9a75f",
    "support"
   ],
-  "generic-sensor/SensorErrorEvent-constructor.html": [
+  "generic-sensor/SensorErrorEvent-constructor.https.html": [
    "99bcfb42c91e084a3b847ab4bab2bad80e548540",
    "testharness"
   ],
   "generic-sensor/generic-sensor-tests.js": [
-   "0b89e14eadd32fd23202977471c9913f5213dce4",
+   "892dc161d4f0376a67c86f73e84f57214e0f3fb0",
    "support"
   ],
   "generic-sensor/idlharness.https.html": [
@@ -538685,7 +537927,7 @@
    "testharness"
   ],
   "gyroscope/Gyroscope_insecure_context.html": [
-   "319bcf346337ccdd67f94ba2d0d4849e5b57da5e",
+   "74e51a1efc06bf8180db430b418d484fc50c07f9",
    "testharness"
   ],
   "gyroscope/Gyroscope_onerror-manual.https.html": [
@@ -538697,7 +537939,7 @@
    "support"
   ],
   "gyroscope/idlharness.https.html": [
-   "2aedb883f553cae594afb7c5ef59222c0ee3fefb",
+   "cd874438f99c173e3d6b4dd4823b113323285b6e",
    "testharness"
   ],
   "hr-time/OWNERS": [
@@ -542297,7 +541539,7 @@
    "testharness"
   ],
   "html/dom/elements-embedded.js": [
-   "5d5d208f38657e9fda1741654909c29807e67d13",
+   "2c20b7d2856d8f7f72b7835b2677ed47abc43629",
    "support"
   ],
   "html/dom/elements-forms.js": [
@@ -547200,6 +546442,14 @@
    "270a8c31ce78e9ae07d8169367224051baf91fd8",
    "testharness"
   ],
+  "html/editing/focus/processing-model/preventScroll.html": [
+   "fca882d5c3a5a78e486d6527d8b0cbf09d23c3e7",
+   "testharness"
+  ],
+  "html/editing/focus/processing-model/support/preventScroll-helper.html": [
+   "ffd270caa596ffb41d5b5f1cdca450fb20a5fded",
+   "support"
+  ],
   "html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
@@ -547757,7 +547007,7 @@
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js": [
-   "6f3dd9aeb9bc4c2419765519586349aaea4c4495",
+   "5b09875b7207da2b908e66e1d75f095f12887247",
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py": [
@@ -552828,10 +552078,18 @@
    "94ed2b8f019e1b65c47c5f971503496bb4765048",
    "testharness"
   ],
+  "html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html": [
+   "22e2747a5cc7346bf639bcef4cffde001dbd688a",
+   "testharness"
+  ],
   "html/semantics/interactive-elements/the-dialog-element/dialog-open.html": [
    "4487ae682d3c4ee2c15b7772bd7a26d8be7d5ffe",
    "testharness"
   ],
+  "html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html": [
+   "1b77c8ff31c1a38afb3a9fa9bf77bf85ac4a264b",
+   "testharness"
+  ],
   "html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html": [
    "c00ac5b6d038b45b1a7cfbef94a4527757fa74e6",
    "testharness"
@@ -552840,6 +552098,10 @@
    "15580f3e0243093710d4914224ca3963992e3f5b",
    "support"
   ],
+  "html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html": [
+   "39b274df2e4ca72a9cd691c9a3ec45fd2f1ba932",
+   "testharness"
+  ],
   "html/semantics/interactive-elements/the-menu-element/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
@@ -553840,8 +553102,12 @@
    "32b68baebfa9d82753f186ff34789922b1467e81",
    "support"
   ],
-  "html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html": [
-   "fd09ee8d075fc21786f6ed605acace65d94d1325",
+  "html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html": [
+   "1f50b5eecae10d42755dde7f2a108ae6353d6154",
+   "testharness"
+  ],
+  "html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html": [
+   "24f8c20c79cdaa6d81e9447e4f616ec5626d36ca",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports.html": [
@@ -553917,7 +553183,7 @@
    "support"
   ],
   "html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype-import.js": [
-   "20e11dd83dec0b7e06abdb50fb1c87d12ec65f88",
+   "3ad923bcb07e7b7aced9bbcd513c34c4504d74c4",
    "support"
   ],
   "html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype.js": [
@@ -553925,7 +553191,7 @@
    "support"
   ],
   "html/semantics/scripting-1/the-script-element/module/errorhandling.html": [
-   "10ccf68924459d54784ebc9cfdcdad21cb20811e",
+   "9b7109ec9111e7961e38d47a15ddb2e6f711c627",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/module/evaluation-error-1.html": [
@@ -554004,6 +553270,18 @@
    "aeee3b59817843111b37ec65d643a09e1ea7d77a",
    "support"
   ],
+  "html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-dependent.js": [
+   "1b36ec082f41a6a7836ac75996a8e9db2069105e",
+   "support"
+  ],
+  "html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-root.js": [
+   "bc8e6d649615d09b970e328873bc138093f1c14d",
+   "support"
+  ],
+  "html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html": [
+   "9758a62ec1f943c00dcd9b58ca62464c5c78bbb3",
+   "testharness"
+  ],
   "html/semantics/scripting-1/the-script-element/module/import-something-namespace.js": [
    "3488bcae45d3094858fad47be6c3b21bfc3ac402",
    "support"
@@ -554232,6 +553510,14 @@
    "4ce8bcce2537785c41f054175119e39169ed6110",
    "testharness"
   ],
+  "html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis": [
+   "a83137f4c22cadb41ca631a8a8cca17c01021f34",
+   "support"
+  ],
+  "html/semantics/scripting-1/the-script-element/module/resources/500-but-js.asis": [
+   "a8f04e8d8fa3fe93abb1ca56a355df34ea533b25",
+   "support"
+  ],
   "html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py": [
    "49a8855de3a01f4fa8abfd5c9dbc3d0c1af2e182",
    "support"
@@ -554260,6 +553546,18 @@
    "c88ce333101627fd7674c1b4ede04fd1d0cf5bae",
    "support"
   ],
+  "html/semantics/scripting-1/the-script-element/module/resources/imports-404-but-js.js": [
+   "0eaed7ae80ca911cf6d2d9c5cca4aca184c643cd",
+   "support"
+  ],
+  "html/semantics/scripting-1/the-script-element/module/resources/imports-500-but-js.js": [
+   "0eaed7ae80ca911cf6d2d9c5cca4aca184c643cd",
+   "support"
+  ],
+  "html/semantics/scripting-1/the-script-element/module/resources/imports-b-cross-origin.sub.js": [
+   "edf619abb179fc343162bc585c4582ab0d4b0c8f",
+   "support"
+  ],
   "html/semantics/scripting-1/the-script-element/module/script-for-event.html": [
    "c225684e0c7d09f9628aab589c8673b140994243",
    "testharness"
@@ -556964,6 +556262,10 @@
    "f9c94ab08fa997459cba17e61d8cd00ee8b07b46",
    "support"
   ],
+  "interfaces/ambient-light.idl": [
+   "bdede54deab80b5465f904a9726ee86f1260858d",
+   "support"
+  ],
   "interfaces/clipboard.idl": [
    "5af2846c7f9ff93f2f4f13780d0356cdac6a0d4f",
    "support"
@@ -556973,7 +556275,7 @@
    "support"
   ],
   "interfaces/cssom-view.idl": [
-   "1bcfadd098734fc82c0cf791d4c0d35d69423ce2",
+   "3f575def818098d376ddf069673692530fcf8896",
    "support"
   ],
   "interfaces/cssom.idl": [
@@ -557001,7 +556303,7 @@
    "support"
   ],
   "interfaces/html.idl": [
-   "5e6afa54c3b4c41f31e24e6fbb55f0e77259c09f",
+   "30bf215678945a0b5732673d0364cbd64867095e",
    "support"
   ],
   "interfaces/mediacapture-main.idl": [
@@ -557028,6 +556330,10 @@
    "de07cb2600834f13c49e00d6d77df5108244b3ce",
    "support"
   ],
+  "interfaces/wake-lock.idl": [
+   "7d0ee3d60a923bf454e18f9116cded1cc3a16f9b",
+   "support"
+  ],
   "interfaces/web-share.idl": [
    "d3ab33fa078f1b3bd4b29e174369073aab3963d5",
    "support"
@@ -557300,12 +556606,20 @@
    "07726af74120e3f066e8fd8f4988616984793428",
    "support"
   ],
+  "longtask-timing/shared-renderer/longtask-in-new-window.html": [
+   "903bb60746deebd8f39ee8ea1a84b40e17884c3c",
+   "testharness"
+  ],
+  "longtask-timing/shared-renderer/resources/frame-with-longtask.html": [
+   "2901b02184fb36d620782fb7fd4a565124580e81",
+   "support"
+  ],
   "magnetometer/Magnetometer.https.html": [
    "3fbdbbd6c3db9b1a44d7490101bea34045f1945e",
    "testharness"
   ],
   "magnetometer/Magnetometer_insecure_context.html": [
-   "9708569b2e2764c973efe31e9f2f4e3de7f7a449",
+   "417e00b969ea887ee4d3d4d9b0dc7af4d786e365",
    "testharness"
   ],
   "magnetometer/Magnetometer_onerror-manual.https.html": [
@@ -557317,7 +556631,7 @@
    "support"
   ],
   "magnetometer/idlharness.https.html": [
-   "a72e1c3443feae9bf9d19385c0ba96e66b97f20c",
+   "32a67a2dc774ed415b28ff0f0c9b0f4c4ecc4e46",
    "testharness"
   ],
   "mathml/OWNERS": [
@@ -558388,8 +557702,8 @@
    "bc5a7f4380a0527fdc44c41b765e07df028d0dba",
    "testharness"
   ],
-  "mediacapture-streams/MediaStream-default-feature-policy.https.sub.html": [
-   "955b6cfddae2c8961abfba52ffe9192224500d0a",
+  "mediacapture-streams/MediaStream-default-feature-policy.https.html": [
+   "2339e7eb9fb14819ce2beb5e0b640a3744dbe4ac",
    "testharness"
   ],
   "mediacapture-streams/MediaStream-finished-add.https.html": [
@@ -558436,8 +557750,12 @@
    "46327fba3cf783d6506634b837f8308417f954cd",
    "testharness"
   ],
+  "mediacapture-streams/MediaStreamTrack-idl.https.html": [
+   "a52c4076cfa4e1b59f7b30725bfa7bd35b831158",
+   "testharness"
+  ],
   "mediacapture-streams/MediaStreamTrack-init.https.html": [
-   "3cb9f842f12185de5f1696a8d0cdc2fe102c246a",
+   "35422d66a08311f92dc1eb02a1b964c887fc02c7",
    "testharness"
   ],
   "mediacapture-streams/MediaStreamTrackEvent-constructor.https.html": [
@@ -558445,7 +557763,7 @@
    "testharness"
   ],
   "mediacapture-streams/OWNERS": [
-   "2ef6c1440dc82da13537af344dfa6a2c84cc0808",
+   "2b20bf18b1f92a2f4c4d56ad1c6a41ec2b34cc9c",
    "support"
   ],
   "mediacapture-streams/historical.html": [
@@ -558476,1598 +557794,1382 @@
    "167112f19752c9c180831820b6e348427606b63b",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "fdeac10c0682de4545c5f0e8f43efb19070cbd91",
+  "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "9219890ab0efa31e4f2db0646e12882da3a5443d",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+  "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html": [
-   "d42b6a62f6883c62590150789377378236b80750",
+  "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "c33974dee06173caa92430a84101a8f22a137910",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html": [
-   "ddd868ad5180c52ebbd63a11d35f2d9b9035fdd6",
+  "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "340cc44b5a863f482a03201080314fea34955270",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+  "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html": [
-   "092b25576f408c393163706d3a798682fcb9bd24",
+  "mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "d7cea0c41a045d0bf87f8fb7d8a1d24b18b746ac",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "70f66e7a32d6dfd50c50609ae9cf4319844c2663",
+  "mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "a0d561f2e6331bb7396f1d95c85bfeb5a3b7f035",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+  "mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html": [
-   "d59539004bc0adefd4b07991bd14f304e70af8fe",
+  "mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "0daaaa67f3edbf3499fa7fc1d33eca4b29ff817f",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "997bba2339d516b691065f619b1b6574fd9e780f",
+  "mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "fdeac10c0682de4545c5f0e8f43efb19070cbd91",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+  "mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html": [
-   "af7edfd9e0489206f7c6bfe18a3111e778985eb4",
+  "mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "d42b6a62f6883c62590150789377378236b80750",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "418445c2b9859a03c2a5920aacb94de91665aec1",
+  "mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "14b799cd9bbff4752cd1bfe2c02ca289ae890dbb",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "8c8cf399a760e744c54c08a990ab1da514409e5a",
+   "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html": [
-   "79c88baefa042eb76d4959129548bb0170b971d0",
+  "mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "3233030cfc42075de689b39be9dca812e153955c",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "a78a3c8b9950ca95859c98837d86540ed7074633",
+   "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "b863686a3679c525b15eddb20c4b41e0aba60509",
+  "mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "c4f7ba79294030cae5439e7d46b3a7d24a01fdf4",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "fab6658b6b049386ff531ffbd38ef0a923eb7e94",
+   "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html": [
-   "0e014ab795a2dec309904ac1d5f766d556a532fe",
+  "mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "73429ee5cb2de97bda1090156d9bb3f716fcce4d",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "64069b6bbac147b17e29d53143fe136944de0daf",
+   "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "87150a15ec0814bf4d9ef31b2175a61be656daa1",
+  "mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "5692d6f7cc2c237a203de6c5a73ff6d6fcb9fc27",
+   "testharness"
+  ],
+  "mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "e716de28d27503516e6066bfe5715880aee61d2d",
+   "testharness"
+  ],
+  "mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "bf977afe3f0b5daa0e899dff1d55241352125531",
+   "testharness"
+  ],
+  "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "1b368a53bec1da5921224e4fd3ae3db4d11014d3",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+  "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html": [
-   "f99ce220a83d0a6f3a2cc3fa3d288fa771990768",
+  "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "97cbafc5bf741afe9c8c5e65777d735d6826fa9a",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "4ea352d10d68e7a09b494534837d04877c0833b3",
+  "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "7557fd8f2d50b6f1d0cde905684cd410a6e6a38a",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+  "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html": [
-   "4cf12d89f0f98a283bc123f44be3ad0e8154be95",
+  "mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "e625621687fe9848f088e9ca72d2d5a07f860dd3",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "c05dd84ba000e6675578e17cf6648e9bea6ce984",
+  "mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "4420b87a357725ceaf7814bee7fbeb5aa6159bcd",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+  "mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html": [
-   "1cbc8f65282ee556a761e3ab9b65e7b5a19c2f39",
+  "mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "d19049e9e686331250dadd2474d7efff8fb2237f",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "f4455e3d16f68f7748eeb9f9455f10869622a701",
+  "mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "ddd868ad5180c52ebbd63a11d35f2d9b9035fdd6",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+  "mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html": [
-   "0ae053a8a446ad06f84200621124ebe5cd82ee63",
+  "mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "092b25576f408c393163706d3a798682fcb9bd24",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "3e5e01b52ef7a96b3dc41a5fd65af5ad14474a4d",
+  "mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "d3f5d8b8cb9fa0b3c0826e5f4cad0ed913e8d6d8",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
+  "mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "850f14b73e3694681b40bebfa85311d424b08e03",
+   "testharness"
+  ],
+  "mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "8e72da4a0a30eb8affa3d7edb42720a55c886558",
+   "testharness"
+  ],
+  "mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "d320e549cc30ba94961be1b50caf86074a20cb9b",
+   "testharness"
+  ],
+  "mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "f8f6b18685d0bf2a351ca2b0e364d4e5ad28fbff",
+   "testharness"
+  ],
+  "mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "3c6bd158494d8407dda0eb0fa70b6e426de82da1",
+   "testharness"
+  ],
+  "mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "ca379c4b2d6461b149d4b6d9cc3bdb60ab43af74",
+   "testharness"
+  ],
+  "mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "06985706784e23cf0bb35338c4486efd9d1c5697",
+   "testharness"
+  ],
+  "mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "8143606c5c55cf172a74969391f1207aa81f2b56",
+   "testharness"
+  ],
+  "mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "685fb35dea4374acb6e597caa53d8298378f1194",
+   "testharness"
+  ],
+  "mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "e63832a2f21819be42f1723ea5f613b8662abb67",
+   "testharness"
+  ],
+  "mixed-content/generic/common.js": [
+   "084e9f76757d8caea2033e8ee7b70b07ef3e5e88",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html": [
-   "1bda6a05728b96428037c271a79a621158600136",
+  "mixed-content/generic/expect.py": [
+   "91b06d89a65d83e45961778587e85cdbf720e72c",
+   "support"
+  ],
+  "mixed-content/generic/mixed-content-test-case.js": [
+   "b9dfc2627be3da315bc7cfbf7684b96add779e62",
+   "support"
+  ],
+  "mixed-content/generic/sanity-checker.js": [
+   "baa34825a23d70a8df1a4feeffe6c866c2b0b062",
+   "support"
+  ],
+  "mixed-content/generic/template/disclaimer.template": [
+   "24505625da3aee99cb1d26ec74f269c3d3384bd2",
+   "support"
+  ],
+  "mixed-content/generic/template/spec_json.js.template": [
+   "a5e61678d2ee01e1d1852296ea1e49e0d933157c",
+   "support"
+  ],
+  "mixed-content/generic/template/test.debug.html.template": [
+   "bb11c3e8855f7590ef1d496032f4357db5781f3b",
+   "support"
+  ],
+  "mixed-content/generic/template/test.js.template": [
+   "99d185691af529f1a7b0c8d74844aefaae946e84",
+   "support"
+  ],
+  "mixed-content/generic/template/test.release.html.template": [
+   "2febaa8ef270c96fe357684db77b9f7487a0156e",
+   "support"
+  ],
+  "mixed-content/generic/template/test_description.template": [
+   "5c11ec4355d351f608adb189b6b1121073210ed4",
+   "support"
+  ],
+  "mixed-content/generic/tools/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "mixed-content/generic/tools/clean.py": [
+   "18f3833ae2532fe99979944a735921abe5295b91",
+   "support"
+  ],
+  "mixed-content/generic/tools/common_paths.py": [
+   "d5f3c03e3ce8dbc4354e08e9e4c7a503e8e1bbf3",
+   "support"
+  ],
+  "mixed-content/generic/tools/generate.py": [
+   "c5e384d4d778bcd887844395429cced9fb778ff1",
+   "support"
+  ],
+  "mixed-content/generic/tools/regenerate": [
+   "d21629058407b1d734417990e1af2663405c6b7d",
+   "support"
+  ],
+  "mixed-content/generic/tools/spec_validator.py": [
+   "b0bc2fc11415034f5c31c70f7eb8506a3f0d44bc",
+   "support"
+  ],
+  "mixed-content/generic/worker.js": [
+   "6a0548ef4b906e539d89940aa791a78bba905262",
+   "support"
+  ],
+  "mixed-content/imageset.https.sub.html": [
+   "e2005b813384f38b64baec9bc431e25aa61f417f",
+   "testharness"
+  ],
+  "mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "3297aaed5d30a40eaed000e51515bd497d4b4556",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html": [
-   "6e7169ab385dd2f55470e072ea92eba5e3b8824f",
+  "mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "b9836f4fea55f02113c5f4aa67e45251e259995c",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+  "mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html": [
-   "92010e28430c2f95effc17bc0db065a5c4c1daef",
+  "mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "0ef4da59f9710f632992bcc92df91dc9864e97d0",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html": [
-   "659b52cf363720e1754889509017ce3a53aa88f3",
+  "mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "d9f8a4ef0df19c5869cdc45913a5cd086fad67d8",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html.headers": [
+  "mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html": [
-   "ebcc61a954dc69e2a008b9dc49b400dd62817d60",
+  "mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "18b7424b5ac56658a6eb352e1756d171232914a7",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html.headers": [
+  "mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html": [
-   "17a051ff8fff1ecc46aaaa50a2bf7461ab6d6917",
+  "mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "30e42b02b2e4219e34f14c1db9f9f36661a252e3",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html.headers": [
+  "mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html": [
-   "7f90901fe5882f4d40c6684cfd79a56639df8190",
+  "mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "418445c2b9859a03c2a5920aacb94de91665aec1",
    "testharness"
   ],
-  "mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html.headers": [
+  "mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html": [
-   "3233030cfc42075de689b39be9dca812e153955c",
+  "mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "79c88baefa042eb76d4959129548bb0170b971d0",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html": [
-   "8e72da4a0a30eb8affa3d7edb42720a55c886558",
-   "testharness"
+  "mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html": [
-   "c3d31fd2f1f6a32223bde84b7e470d138f620c23",
+  "mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "567ddeb24116c1baff970033edaf0d4dc0da6be3",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html": [
-   "d94041986702c79409dbc47a781e474c013f6841",
+  "mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "a19d2471f64b54a094a78bbbe9c6725e6d6f622b",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html": [
+  "mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
    "e7f04510ff694817b86854338d6670f75569ec4a",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html": [
-   "30a0da5f517ebcd5aabeb83f643f95adecbf0020",
+  "mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "fbb072d21734ec0387417e01c44420f36be2ea4e",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html": [
-   "d1fea7e4b5e32b88797cdfaea1deaced699e3a80",
+  "mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "13816e08b8649393a7c31d61e47e759068f88c76",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html": [
-   "aff6c1addf9175f05d92eb428d0c9e11d38f848a",
+  "mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "130ab390be334b9695b83c5396ac676e984be8ee",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html": [
-   "f93e80c420734892b2871987012b09a2aff02a6c",
+  "mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "51e46bfe0a9ff9e06e6c8097ce28aada274c7338",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html": [
-   "0575fd64689c5b0f3970bdad033fe944ff6644bb",
+  "mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "6d99ccf84a81132846a1eee2e733914b533bce1d",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html": [
-   "a55b1cc03051118df894858733f91cb794ed893e",
+  "mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "753545df28dca7ca5897af13494f4d4197fa29e9",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html": [
-   "2c86c9ea5db3726274091327ce5d6573306af093",
+  "mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "f39f2385de0ccf863625cbca210237be123c04c0",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html": [
-   "25f22da0d0ef7acbaface0ffff30b1abc8b53402",
+  "mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "206d37c0c2fa57ed094dd25281df5dcdeacd043f",
    "testharness"
   ],
-  "mixed-content/allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html": [
-   "e20eb313f66981ae7bb650a19d8fd61f62b5bd9b",
+  "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "e9f1a5942b08e77813d276fb8f6006f22285f2c4",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "e716de28d27503516e6066bfe5715880aee61d2d",
-   "testharness"
+  "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html": [
-   "bf977afe3f0b5daa0e899dff1d55241352125531",
+  "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "3c1443674319382c15b45013df25e3e51a503cdd",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html": [
-   "685fb35dea4374acb6e597caa53d8298378f1194",
-   "testharness"
+  "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html": [
-   "e63832a2f21819be42f1723ea5f613b8662abb67",
+  "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "2b5ff960661b5f817bb8215d2e86106ddfc91b1d",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "0f6b02d991b8c3ec69d3655e32f78ba1ff16ef2d",
-   "testharness"
+  "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html": [
-   "7094738a8839ee070d201cb023a12acd81f60863",
+  "mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "01395c96e354c0af36515eb7b0ad6e765036bcf7",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "1c3153216d817b75ace4f9fa125ed9514bafa4d4",
-   "testharness"
+  "mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html": [
-   "94228b14e01e62a595f5dcc0d21c5210ee6060dc",
+  "mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "47531b96c24769e26c351dd674860675006bac0e",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "f39f2385de0ccf863625cbca210237be123c04c0",
-   "testharness"
+  "mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html": [
-   "206d37c0c2fa57ed094dd25281df5dcdeacd043f",
+  "mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "36e152879abe90057cabd70a968c249963732158",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "5f385b92afdf5a2049f255f1551c823ec85d8770",
-   "testharness"
+  "mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html": [
-   "0e215b6c8f95aea079d53dca4e18e513c50ef9c0",
+  "mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "b863686a3679c525b15eddb20c4b41e0aba60509",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "fcde72bedd849665aea76ee1b1725a850a0b063c",
-   "testharness"
+  "mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html": [
-   "0ba5da404b387e28c64c18fae6264df2922b363a",
+  "mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "0e014ab795a2dec309904ac1d5f766d556a532fe",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "d0757e9a96f38ef1783438c798be3bce7b81e7ec",
-   "testharness"
+  "mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/no-redirect/allowed.https.html": [
-   "eacb8d4787918f3d6721833dabdf9163775129c3",
+  "mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "d576b5a595397da44d77511c0113c17b7ce1ab63",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "618704362f25e8f71fb43ec2e8412f2771be7aee",
+  "mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "ec2ef32e47690b64cdfda25e21021b13f7d5a73f",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html": [
-   "f5755364f4c91973c9a554bdf0c12dc50338f0b6",
+  "mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "30a0da5f517ebcd5aabeb83f643f95adecbf0020",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "cac312888c207c6b0c0f7aa9691f528881595eb3",
+  "mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "73d2502e467486f0f6d36334d054faa8633ecb98",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/no-redirect/allowed.https.html": [
-   "f87d399643fdbdc7135e1db1fd9b3ff9c9a4bbec",
+  "mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "f586b47be1e7c0ec813be913c9fbefad81a0e3fa",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html": [
-   "3ac75e4ddf21586beec825628aa421ce66b3eb51",
+  "mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "e3257526e74e3f48ee9d03e9d0fbcbdb80052924",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html": [
-   "1c26515cb6831d895f537df85edb2c9709cae754",
+  "mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "a0320c0c7a3c0ef91bf9b4e87d98fd08b68f4b04",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html": [
-   "1995b32e30a3a6e970268d8baf734c39512a91d1",
+  "mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "a2fc6bdb285691f5bbf66e37e69d9f8260fed461",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/no-redirect/allowed.https.html": [
-   "320025af3c5a47640a9dab5792160c7c14de917d",
+  "mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "bee9616c4fa9bdc792bdcbccdf340bf08f086150",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html": [
-   "5f6030ee661ead982d88e8fa281c0ff82bb72f2d",
+  "mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "5f385b92afdf5a2049f255f1551c823ec85d8770",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html": [
-   "531546fa4c30f76ed51c7771b9dca10de58d2df0",
+  "mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "0e215b6c8f95aea079d53dca4e18e513c50ef9c0",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html": [
-   "bc2047414c044ac1a9c5efeef6a53dbccd0eab0e",
+  "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "013eb078c215d37a8a52f266beaf9d3871fee401",
    "testharness"
   ],
-  "mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html": [
-   "bebcdea2930456cab89c92fe28acef2f22520868",
-   "testharness"
+  "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "1b368a53bec1da5921224e4fd3ae3db4d11014d3",
+  "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "c10fe679c6cb2d69d5c6eaaa985d7d0aebf9e86a",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "97cbafc5bf741afe9c8c5e65777d735d6826fa9a",
+  "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "f07bd06527b7c4210c408a3593f5142f5ad47213",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "7557fd8f2d50b6f1d0cde905684cd410a6e6a38a",
+  "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "82b2035593f5408f7c3e53b640cca2f14214c606",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "e115698289a9d17fbc62ec687386b0e87cc14c02",
+  "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "0671d48855fd3fc222e13579c7b9cc10ec822898",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "14db9212062e509ee2c9def3751e6b8322c4b3a6",
+  "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "11a64084b74832bef705a46b1ef006b2e51d9bca",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "0976d0cb1e822750c839dae814d6b55c50209002",
+  "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "87150a15ec0814bf4d9ef31b2175a61be656daa1",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "3a6070534671822bfafa04e1241404e62d583803",
+  "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "f99ce220a83d0a6f3a2cc3fa3d288fa771990768",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "719552385c6a6c566ac35608812e6b4b0803f854",
+  "mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "bc56ec3ab4cc4e13527189fb43f36ebb27fa71c0",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "ce3eb59ff993f2731c6af61806217caf7f6c3bbd",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "941fba9aff4f9add1d61d0e6fc96898739b8214e",
+  "mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "d1fea7e4b5e32b88797cdfaea1deaced699e3a80",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "baed43b2d575d296fea4d71452adea468bd02fc0",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "e9f1a5942b08e77813d276fb8f6006f22285f2c4",
+  "mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "8995bfa6816c2697dc449675768727abd5ecb266",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "2b4266e2798cffa4df8085d85dc6192151125d13",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "3c1443674319382c15b45013df25e3e51a503cdd",
+  "mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "34f1424d91ee6bbe1f0c6aa46e307104443f70bd",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "62a276c360cb5540fe5decc2f388d4c667007a9b",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "2b5ff960661b5f817bb8215d2e86106ddfc91b1d",
+  "mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "b98e1a5a55b229fabc73ff520e93d1aae5786a84",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "fcde72bedd849665aea76ee1b1725a850a0b063c",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
+  "mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "0ba5da404b387e28c64c18fae6264df2922b363a",
+   "testharness"
+  ],
+  "mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
    "9846bf56c8aae52383ea4d3c2f57b6465c41e8c2",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html": [
+  "mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
    "ba66dc6b0f3a9806a71ecc3b338bf2c05324b164",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
+  "mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
    "e2983c5ab711c5e5f774bfb83b5995543cc80902",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "74ee909bb1113ed447e492e8d69ffbf0396f52fa",
+  "mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "fd47588e79f522d8dee27aa9d0a84b9b6601e32b",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "1269f955175202b38a101b41e39a501adcc20318",
+  "mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "c1af3b62c95c3ab6e546dd254e29740a59755b5c",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "734adc8316240fc0c59f894f8e1afb4cab96b5bc",
+  "mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "c78e4550af6fd09317198fc9bc7320893e0d40e3",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "e53fefbcca3276f2df412aea464a9b22edc814b0",
+  "mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "4ea352d10d68e7a09b494534837d04877c0833b3",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "74de74754cb3eff1ee36cdedc8fe4b462e74d981",
+  "mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "4cf12d89f0f98a283bc123f44be3ad0e8154be95",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "4caee58efa828f1f22652c6277f211f062b65a84",
+  "mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "09f76ce129d6cf3aa657364096bb5db0b5494fbb",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "80231d8f74e6eef51cfe8d17f65e0bd4ecd1a486",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "a03f2d10ce648aeb6ead81640bb0ac19d51dfc02",
+  "mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "aff6c1addf9175f05d92eb428d0c9e11d38f848a",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "94faefefb051f2968d1e0ee07e15cda7036a5891",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "ed71a01c978180e6aa46334413cfb4bf8b88583a",
+  "mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "0442965d6e430177a0e077fed605bce319881970",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "ccfde2b296a3d52de27fd71b02efe41559c60b6c",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "4d2f1df622377ac842c2d6da88fa3fc6b685e32e",
+  "mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "c10ff7480b86efb7c2611df68de0b6f12cbecf7f",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "77f302421296a3f6ed4e434047408b3501ee1f84",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "a05a81adc5bb1053cad2c3925137713cf6b46aee",
+  "mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "93c5cdb58d33827b7ad31c1a3ca04ed6c851c3bd",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "d0757e9a96f38ef1783438c798be3bce7b81e7ec",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "4dee268f091d9177f643c9124f67f5c4485dd5cf",
+  "mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "eacb8d4787918f3d6721833dabdf9163775129c3",
+   "testharness"
+  ],
+  "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "74ee909bb1113ed447e492e8d69ffbf0396f52fa",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "6ee9f3e5cf9c4ec02c4f120967e1c244cbc68fa6",
+  "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "1269f955175202b38a101b41e39a501adcc20318",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html": [
-   "6b9c88d92064dbbdd07b92345d063eaec5f68713",
+  "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "734adc8316240fc0c59f894f8e1afb4cab96b5bc",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers": [
+  "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
-   "691023bc8308fdc29ddad998e6ab499495c5f5c7",
+  "mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "814046620038dfefc228cd03f7f7f2baad484001",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers": [
+  "mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html": [
-   "b5ad573ce748c77d37c2e0449819966194a2cb23",
+  "mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "8d4604a30bab54e269b0136d57c8bdf41ee29a65",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers": [
+  "mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "e625621687fe9848f088e9ca72d2d5a07f860dd3",
+  "mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "cbb64c2ca8e5a607492a1b87c913183b863207e8",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "4420b87a357725ceaf7814bee7fbeb5aa6159bcd",
+  "mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "c05dd84ba000e6675578e17cf6648e9bea6ce984",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "d19049e9e686331250dadd2474d7efff8fb2237f",
+  "mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "1cbc8f65282ee556a761e3ab9b65e7b5a19c2f39",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "74435ce01c94ed8aa8d04601a60e4b3adb3a8644",
+  "mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "e9477ca6d86d559203160713a361e2e8d40f6f43",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "29a087c7d7fc5098de0bacdce1be2c21d2ed08c4",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "7df4d4b358944e2b1d0b0d97cc117b3c76699c3f",
+  "mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "f93e80c420734892b2871987012b09a2aff02a6c",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "d0252ca68cce41f5119cd712eeb554c829c7d159",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "add636ede59cbd992aebd9765c228c5669cde969",
+  "mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "025548c39db624872c1e585d0ced245a7f6aaa10",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "357bdfe7c0fdc3ee26b491360ea02e14ef43e895",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "d6d3e22e61141fb9f788845bd90d5f358ee1fce2",
+  "mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "9d16e4441853ecea2af23daf2e995c3c1e8d023b",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "045c10ef5cffeeba485b9184baf193193f8bb37b",
+   "testharness"
+  ],
+  "mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "89bb7e2e7d22dd99f8d4af4dcf5ac64179095cb3",
+   "testharness"
+  ],
+  "mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "618704362f25e8f71fb43ec2e8412f2771be7aee",
+   "testharness"
+  ],
+  "mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "f5755364f4c91973c9a554bdf0c12dc50338f0b6",
+   "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "c2e6a6d9b819ab539585e9c525b32139ba64357c",
+  "mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "e53fefbcca3276f2df412aea464a9b22edc814b0",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "094bab59c31b19dc57b7f37a2a9fb4e4a15f009f",
+  "mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "74de74754cb3eff1ee36cdedc8fe4b462e74d981",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "01395c96e354c0af36515eb7b0ad6e765036bcf7",
+  "mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "4caee58efa828f1f22652c6277f211f062b65a84",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "47531b96c24769e26c351dd674860675006bac0e",
+  "mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "6bbec3f09f74b6629b92635847ea1fe638fb4810",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "36e152879abe90057cabd70a968c249963732158",
+  "mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "8f2a257a819d5fbc575a91dcb7912c0cc4f9e276",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "fd47588e79f522d8dee27aa9d0a84b9b6601e32b",
+  "mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "667d1f0e2b2bfe88332582aafd35a98abc69242a",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "c1af3b62c95c3ab6e546dd254e29740a59755b5c",
+  "mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "f4455e3d16f68f7748eeb9f9455f10869622a701",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "c78e4550af6fd09317198fc9bc7320893e0d40e3",
+  "mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "0ae053a8a446ad06f84200621124ebe5cd82ee63",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "814046620038dfefc228cd03f7f7f2baad484001",
+  "mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "71c181fe1f20693bc9e09cea5f7695367039f7e9",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
+  "mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "4036b7616ca2decf0caa2da126366c665223b29a",
+   "testharness"
+  ],
+  "mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "0575fd64689c5b0f3970bdad033fe944ff6644bb",
+   "testharness"
+  ],
+  "mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "ba0eabc6fbbc306c00fef83c92068522eac4e252",
+   "testharness"
+  ],
+  "mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "6e44c9b545c65120bf141a4607dc699fc7d0ff65",
+   "testharness"
+  ],
+  "mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "afb0e3ceab5ef3546c141fcb4a59bc2534ad6f96",
+   "testharness"
+  ],
+  "mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "eff14051b0d96ac2912a2c08627ae83ffa670c32",
+   "testharness"
+  ],
+  "mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "673c25054941a7418d9e2d58cc15989af60dff49",
+   "testharness"
+  ],
+  "mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "9d1e3a182216aca29bf3d0533c4eb4146a12439f",
+   "testharness"
+  ],
+  "mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "cac312888c207c6b0c0f7aa9691f528881595eb3",
+   "testharness"
+  ],
+  "mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "f87d399643fdbdc7135e1db1fd9b3ff9c9a4bbec",
+   "testharness"
+  ],
+  "mixed-content/spec.src.json": [
+   "5edaa65af1b7d9f8941442dfec71e087d521c22e",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "8d4604a30bab54e269b0136d57c8bdf41ee29a65",
+  "mixed-content/spec_json.js": [
+   "212f362ad9a8828575eaca2b003a83a2276b3faa",
+   "support"
+  ],
+  "mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "7d8287e92f8bf9390ee288859bce6a53e2ef10f5",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "cbb64c2ca8e5a607492a1b87c913183b863207e8",
+  "mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "4a26f10611caf659f57af1287aab4685ac110443",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "6bbec3f09f74b6629b92635847ea1fe638fb4810",
+  "mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "0b2db89b6bb92ecf6e8f8014140f7c1f10477f2a",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "8f2a257a819d5fbc575a91dcb7912c0cc4f9e276",
+  "mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "e4fe14b8c7355422c20cd1c2f4f33437dddb7e02",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "667d1f0e2b2bfe88332582aafd35a98abc69242a",
+  "mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "1c6d741645d9b41a3847f1da157337674c3ae19b",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "d521eef60aed44bda303f4fd9a489a1da57c484a",
+  "mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "5df12ad26931920476ecb418c86c39ed4db0445c",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "1aa1b1c1671f6af5414c00c1ae69cb4ed21bb8db",
+  "mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "3e5e01b52ef7a96b3dc41a5fd65af5ad14474a4d",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "118e34520665f3f18653560b134294757bb13677",
+  "mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "1bda6a05728b96428037c271a79a621158600136",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "9078db166f3192631b0ff9ce1aded81dc69c48f0",
+  "mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "f9829ff242b6cb60deb52560d98c5b4415257598",
+   "testharness"
+  ],
+  "mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
+   "cf89b222539b6fb932f0ffb226b4584c55bd7b0b",
+   "testharness"
+  ],
+  "mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "a55b1cc03051118df894858733f91cb794ed893e",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "80519194240ebaebe70a1782d972fb5e1641f5a1",
+   "testharness"
+  ],
+  "mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "91ad70b49d688006d8d560aa536d6d46a8de1275",
+   "testharness"
+  ],
+  "mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "72e3fa99e486be0aedd623da3beb2d8b0b745ad1",
+   "testharness"
+  ],
+  "mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "67b828060540ab4abb8d7070a3a777dcb6b764c4",
+   "testharness"
+  ],
+  "mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "f366b0f28d087b46c7e1b8787012b0427a5c668e",
+   "testharness"
+  ],
+  "mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
+   "845e3332f83a552ba268bd369089cd408c5c9ed1",
+   "testharness"
+  ],
+  "mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "3ac75e4ddf21586beec825628aa421ce66b3eb51",
+   "testharness"
+  ],
+  "mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "1c26515cb6831d895f537df85edb2c9709cae754",
+   "testharness"
+  ],
+  "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
+   "6b9c88d92064dbbdd07b92345d063eaec5f68713",
+   "testharness"
+  ],
+  "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "bfbfa521d0cd88ef4d0ef2afd8734a947d4b1afc",
+  "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
+   "691023bc8308fdc29ddad998e6ab499495c5f5c7",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "dcc79a06477815beedcc28e96caaafb5e7a6952a",
+  "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
+   "b5ad573ce748c77d37c2e0449819966194a2cb23",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
    "4803f9a0af1905d66e25e7acccf206b91161122b",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers": [
+  "mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
    "06fe8b272d387c07963fcd4a5c71b0dc5e336055",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers": [
+  "mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
    "2b6d45a1d2863299d52b9d705a3276b1f26f8eaf",
    "testharness"
   ],
-  "mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers": [
+  "mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "d3f5d8b8cb9fa0b3c0826e5f4cad0ed913e8d6d8",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "0658ac8102eb4484a20ab5d7a72b895a04abe142",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "4c18960396a7238e977114664b9e46d3d28e5c45",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "d576b5a595397da44d77511c0113c17b7ce1ab63",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "09f76ce129d6cf3aa657364096bb5db0b5494fbb",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "e9477ca6d86d559203160713a361e2e8d40f6f43",
+  "mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html": [
+   "17a051ff8fff1ecc46aaaa50a2bf7461ab6d6917",
    "testharness"
   ],
-  "mixed-content/blockable/meta-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "71c181fe1f20693bc9e09cea5f7695367039f7e9",
-   "testharness"
+  "mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/blockable/meta-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "305468573dfa863a5df32d0e630d6b155facf61a",
+  "mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html": [
+   "7f90901fe5882f4d40c6684cfd79a56639df8190",
    "testharness"
   ],
-  "mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "816c13985e7ad563cedcdd67917c48192c044129",
-   "testharness"
+  "mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html.headers": [
+   "562977daf4fd9e09dc6153058804bc247cbe5354",
+   "support"
   ],
-  "mixed-content/blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
    "a225e9696b04e277a74042824c7dc911183505c2",
    "testharness"
   ],
-  "mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "850f14b73e3694681b40bebfa85311d424b08e03",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "801e8dfa3946c2a6924c12dac4aeab98962aa5bb",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "cba39dadaea345956a12d9cf4e7398c410e46e05",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "ec2ef32e47690b64cdfda25e21021b13f7d5a73f",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "80231d8f74e6eef51cfe8d17f65e0bd4ecd1a486",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "29a087c7d7fc5098de0bacdce1be2c21d2ed08c4",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "4036b7616ca2decf0caa2da126366c665223b29a",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "9b1254a85fc448c923590a4676a250a48ec09141",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html": [
-   "1e18c27f72a237a4343bc8da4112b5eb54d3a483",
-   "testharness"
-  ],
-  "mixed-content/blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
    "8e304be8f31ceda4704fceacbea55bfa480a763b",
    "testharness"
   ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "d320e549cc30ba94961be1b50caf86074a20cb9b",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "f8f6b18685d0bf2a351ca2b0e364d4e5ad28fbff",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "3c6bd158494d8407dda0eb0fa70b6e426de82da1",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "2933da17f32832dfe51a97dc2a32a69e93015663",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "68d632b99f1a8b4d9fa98b2430b07b885d9029ee",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "830c46e73d1f2f52c5f27fa1eabd1c55e53f7521",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "f8c5334989380b7de82057e72402cacff67c6eaf",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "288adad55f4c2bf013f8c11af4bd097341d56e13",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "8e660870d237c4252f14fa298f8434ff0609fb9b",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "73d2502e467486f0f6d36334d054faa8633ecb98",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "f586b47be1e7c0ec813be913c9fbefad81a0e3fa",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "e3257526e74e3f48ee9d03e9d0fbcbdb80052924",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "94faefefb051f2968d1e0ee07e15cda7036a5891",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "0442965d6e430177a0e077fed605bce319881970",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "ccfde2b296a3d52de27fd71b02efe41559c60b6c",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "d0252ca68cce41f5119cd712eeb554c829c7d159",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "025548c39db624872c1e585d0ced245a7f6aaa10",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "357bdfe7c0fdc3ee26b491360ea02e14ef43e895",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "ba0eabc6fbbc306c00fef83c92068522eac4e252",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "6e44c9b545c65120bf141a4607dc699fc7d0ff65",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "afb0e3ceab5ef3546c141fcb4a59bc2534ad6f96",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "bcf79c2ac994f0693cc365fe39d6b688b56478e3",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "83875afdad45086319362997c8f63eac33de26e6",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "c5e6681e8ba41f87008f8ecaef22d6884b027cf4",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "19b2b2997f3a25a5dd6cde1f84ba747bb19825bc",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "95fbdacd48340ce461be960949be3e7b9ab2764b",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "e31bb3f3e52c40975424856b69d7469abda02b8e",
+  "mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html": [
+   "e20eb313f66981ae7bb650a19d8fd61f62b5bd9b",
    "testharness"
   ],
-  "mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
    "dc8446670136131eac95054e6a38b53c9bf4fd2d",
    "testharness"
   ],
-  "mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
    "506b4deca771b691d19ee61fa034edeb4fa7ae1d",
    "testharness"
   ],
-  "mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
    "4be081e0c1f8c19090172b0e4af398914343a1e3",
    "testharness"
   ],
-  "mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "ca379c4b2d6461b149d4b6d9cc3bdb60ab43af74",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "06985706784e23cf0bb35338c4486efd9d1c5697",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "8143606c5c55cf172a74969391f1207aa81f2b56",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "56414b8f71fa21fc3899a527ae1c1657703fe034",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "b1a24bb9ebd3f28d11681a262c433c9bcfd062de",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "d2d7c2422f621514128cde2f706bf24df6dfa85b",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "4271e5052b787c14779ec8c490161b7aa1cda2ed",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "22323c1a234976ee583c4a0dd5ebfd7ae4429910",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "1e819fb1b0b8666b8ac540dde34fa25e677c13a0",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "a0320c0c7a3c0ef91bf9b4e87d98fd08b68f4b04",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "a2fc6bdb285691f5bbf66e37e69d9f8260fed461",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "bee9616c4fa9bdc792bdcbccdf340bf08f086150",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "c10ff7480b86efb7c2611df68de0b6f12cbecf7f",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "77f302421296a3f6ed4e434047408b3501ee1f84",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "93c5cdb58d33827b7ad31c1a3ca04ed6c851c3bd",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "9d16e4441853ecea2af23daf2e995c3c1e8d023b",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "045c10ef5cffeeba485b9184baf193193f8bb37b",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "89bb7e2e7d22dd99f8d4af4dcf5ac64179095cb3",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "eff14051b0d96ac2912a2c08627ae83ffa670c32",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "673c25054941a7418d9e2d58cc15989af60dff49",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "9d1e3a182216aca29bf3d0533c4eb4146a12439f",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "b41e5b6237f7ec850bafe64e76c0109b2a9e8ab5",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "a8f0169f868178de2ab37b0df54b9872a7ed472f",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "f7d9111010f455a27d8ac16e059ae916d752db9e",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html": [
-   "9056f80a591260d1aa42ee7736d0311aaa2715d2",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html": [
-   "1740e8e89a8745045c1ba9bede52e8254cd9a761",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html": [
-   "1465e83fe04abfec639018b0568f49e2543b2774",
-   "testharness"
-  ],
-  "mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
    "f35738cbdb85f1f8e4c10ecc34db364df56553e2",
    "testharness"
   ],
-  "mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
    "6220bb3c6e9fe2938179e11c46ee027b04961cfd",
    "testharness"
   ],
-  "mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html": [
+  "mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
    "bd927296c023ec51f5817b5e5cd7d7950aac0c64",
    "testharness"
   ],
-  "mixed-content/generic/common.js": [
-   "da5a387c0e7f5713d3648be567261d0c24e3935c",
-   "support"
-  ],
-  "mixed-content/generic/expect.py": [
-   "df0c65ee2cf95134dd0d0b8dcb86a734e6ec57df",
-   "support"
-  ],
-  "mixed-content/generic/mixed-content-test-case.js": [
-   "4ea725dcae414b44768bdb59b7686c8dc97fdfdb",
-   "support"
-  ],
-  "mixed-content/generic/sanity-checker.js": [
-   "baa34825a23d70a8df1a4feeffe6c866c2b0b062",
-   "support"
-  ],
-  "mixed-content/generic/template/disclaimer.template": [
-   "24505625da3aee99cb1d26ec74f269c3d3384bd2",
-   "support"
-  ],
-  "mixed-content/generic/template/spec_json.js.template": [
-   "a5e61678d2ee01e1d1852296ea1e49e0d933157c",
-   "support"
-  ],
-  "mixed-content/generic/template/test.debug.html.template": [
-   "bb11c3e8855f7590ef1d496032f4357db5781f3b",
-   "support"
-  ],
-  "mixed-content/generic/template/test.js.template": [
-   "99d185691af529f1a7b0c8d74844aefaae946e84",
-   "support"
-  ],
-  "mixed-content/generic/template/test.release.html.template": [
-   "2febaa8ef270c96fe357684db77b9f7487a0156e",
-   "support"
-  ],
-  "mixed-content/generic/template/test_description.template": [
-   "5c11ec4355d351f608adb189b6b1121073210ed4",
-   "support"
-  ],
-  "mixed-content/generic/tools/__init__.py": [
-   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-   "support"
-  ],
-  "mixed-content/generic/tools/clean.py": [
-   "bd717c730c1edc9711a7429cf8827b8a4ba881c3",
-   "support"
-  ],
-  "mixed-content/generic/tools/common_paths.py": [
-   "00eb1a2df18ee12da9ce8e145833221f6ed880bc",
-   "support"
-  ],
-  "mixed-content/generic/tools/generate.py": [
-   "c5e384d4d778bcd887844395429cced9fb778ff1",
-   "support"
-  ],
-  "mixed-content/generic/tools/regenerate": [
-   "d21629058407b1d734417990e1af2663405c6b7d",
-   "support"
-  ],
-  "mixed-content/generic/tools/spec_validator.py": [
-   "b0bc2fc11415034f5c31c70f7eb8506a3f0d44bc",
-   "support"
-  ],
-  "mixed-content/generic/worker.js": [
-   "6a0548ef4b906e539d89940aa791a78bba905262",
-   "support"
-  ],
-  "mixed-content/imageset.https.sub.html": [
-   "e2005b813384f38b64baec9bc431e25aa61f417f",
+  "mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html": [
+   "bc2047414c044ac1a9c5efeef6a53dbccd0eab0e",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "9219890ab0efa31e4f2db0646e12882da3a5443d",
+  "mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html": [
+   "bebcdea2930456cab89c92fe28acef2f22520868",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
-  ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "c33974dee06173caa92430a84101a8f22a137910",
+  "mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "a03f2d10ce648aeb6ead81640bb0ac19d51dfc02",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "340cc44b5a863f482a03201080314fea34955270",
+  "mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "ed71a01c978180e6aa46334413cfb4bf8b88583a",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "3297aaed5d30a40eaed000e51515bd497d4b4556",
+  "mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "4d2f1df622377ac842c2d6da88fa3fc6b685e32e",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "b9836f4fea55f02113c5f4aa67e45251e259995c",
+  "mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "d521eef60aed44bda303f4fd9a489a1da57c484a",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "0ef4da59f9710f632992bcc92df91dc9864e97d0",
+  "mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "1aa1b1c1671f6af5414c00c1ae69cb4ed21bb8db",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "013eb078c215d37a8a52f266beaf9d3871fee401",
+  "mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "118e34520665f3f18653560b134294757bb13677",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "c10fe679c6cb2d69d5c6eaaa985d7d0aebf9e86a",
+  "mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "6e7169ab385dd2f55470e072ea92eba5e3b8824f",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "f07bd06527b7c4210c408a3593f5142f5ad47213",
+  "mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "92010e28430c2f95effc17bc0db065a5c4c1daef",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "7d8287e92f8bf9390ee288859bce6a53e2ef10f5",
+  "mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "305468573dfa863a5df32d0e630d6b155facf61a",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
-  ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "4a26f10611caf659f57af1287aab4685ac110443",
+  "mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "9b1254a85fc448c923590a4676a250a48ec09141",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
-  ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "0b2db89b6bb92ecf6e8f8014140f7c1f10477f2a",
+  "mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "2c86c9ea5db3726274091327ce5d6573306af093",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
-  ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "d7cea0c41a045d0bf87f8fb7d8a1d24b18b746ac",
+  "mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "bcf79c2ac994f0693cc365fe39d6b688b56478e3",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "83875afdad45086319362997c8f63eac33de26e6",
+   "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "a0d561f2e6331bb7396f1d95c85bfeb5a3b7f035",
+  "mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "c5e6681e8ba41f87008f8ecaef22d6884b027cf4",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "b41e5b6237f7ec850bafe64e76c0109b2a9e8ab5",
+   "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "0daaaa67f3edbf3499fa7fc1d33eca4b29ff817f",
+  "mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "a8f0169f868178de2ab37b0df54b9872a7ed472f",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "f7d9111010f455a27d8ac16e059ae916d752db9e",
+   "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "d9f8a4ef0df19c5869cdc45913a5cd086fad67d8",
+  "mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "1995b32e30a3a6e970268d8baf734c39512a91d1",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
-   "562977daf4fd9e09dc6153058804bc247cbe5354",
-   "support"
+  "mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "320025af3c5a47640a9dab5792160c7c14de917d",
+   "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "18b7424b5ac56658a6eb352e1756d171232914a7",
+  "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "a05a81adc5bb1053cad2c3925137713cf6b46aee",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "30e42b02b2e4219e34f14c1db9f9f36661a252e3",
+  "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "4dee268f091d9177f643c9124f67f5c4485dd5cf",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "82b2035593f5408f7c3e53b640cca2f14214c606",
+  "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "6ee9f3e5cf9c4ec02c4f120967e1c244cbc68fa6",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "0671d48855fd3fc222e13579c7b9cc10ec822898",
+  "mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "9078db166f3192631b0ff9ce1aded81dc69c48f0",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "11a64084b74832bef705a46b1ef006b2e51d9bca",
+  "mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "bfbfa521d0cd88ef4d0ef2afd8734a947d4b1afc",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html": [
-   "e4fe14b8c7355422c20cd1c2f4f33437dddb7e02",
+  "mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
+   "dcc79a06477815beedcc28e96caaafb5e7a6952a",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "1c6d741645d9b41a3847f1da157337674c3ae19b",
+  "mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "659b52cf363720e1754889509017ce3a53aa88f3",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html": [
-   "5df12ad26931920476ecb418c86c39ed4db0445c",
+  "mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "ebcc61a954dc69e2a008b9dc49b400dd62817d60",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers": [
+  "mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
    "562977daf4fd9e09dc6153058804bc247cbe5354",
    "support"
   ],
-  "mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "14b799cd9bbff4752cd1bfe2c02ca289ae890dbb",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "567ddeb24116c1baff970033edaf0d4dc0da6be3",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "bc56ec3ab4cc4e13527189fb43f36ebb27fa71c0",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "f9829ff242b6cb60deb52560d98c5b4415257598",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "8c8cf399a760e744c54c08a990ab1da514409e5a",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "a19d2471f64b54a094a78bbbe9c6725e6d6f622b",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "ce3eb59ff993f2731c6af61806217caf7f6c3bbd",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html": [
-   "cf89b222539b6fb932f0ffb226b4584c55bd7b0b",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
-   "a78a3c8b9950ca95859c98837d86540ed7074633",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
-   "c4f7ba79294030cae5439e7d46b3a7d24a01fdf4",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
-   "fab6658b6b049386ff531ffbd38ef0a923eb7e94",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
-   "fbb072d21734ec0387417e01c44420f36be2ea4e",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
-   "13816e08b8649393a7c31d61e47e759068f88c76",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
-   "130ab390be334b9695b83c5396ac676e984be8ee",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
-   "baed43b2d575d296fea4d71452adea468bd02fc0",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
-   "8995bfa6816c2697dc449675768727abd5ecb266",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
-   "2b4266e2798cffa4df8085d85dc6192151125d13",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
-   "80519194240ebaebe70a1782d972fb5e1641f5a1",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
-   "91ad70b49d688006d8d560aa536d6d46a8de1275",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
-   "72e3fa99e486be0aedd623da3beb2d8b0b745ad1",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
-   "73429ee5cb2de97bda1090156d9bb3f716fcce4d",
-   "testharness"
-  ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
-   "64069b6bbac147b17e29d53143fe136944de0daf",
+  "mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "816c13985e7ad563cedcdd67917c48192c044129",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
-   "5692d6f7cc2c237a203de6c5a73ff6d6fcb9fc27",
+  "mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
+   "1e18c27f72a237a4343bc8da4112b5eb54d3a483",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
-   "51e46bfe0a9ff9e06e6c8097ce28aada274c7338",
+  "mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "25f22da0d0ef7acbaface0ffff30b1abc8b53402",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
-   "6d99ccf84a81132846a1eee2e733914b533bce1d",
+  "mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "19b2b2997f3a25a5dd6cde1f84ba747bb19825bc",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
-   "753545df28dca7ca5897af13494f4d4197fa29e9",
+  "mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "95fbdacd48340ce461be960949be3e7b9ab2764b",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
-   "34f1424d91ee6bbe1f0c6aa46e307104443f70bd",
+  "mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "e31bb3f3e52c40975424856b69d7469abda02b8e",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
-   "62a276c360cb5540fe5decc2f388d4c667007a9b",
+  "mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "9056f80a591260d1aa42ee7736d0311aaa2715d2",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
-   "b98e1a5a55b229fabc73ff520e93d1aae5786a84",
+  "mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
+   "1740e8e89a8745045c1ba9bede52e8254cd9a761",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html": [
-   "67b828060540ab4abb8d7070a3a777dcb6b764c4",
+  "mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
+   "1465e83fe04abfec639018b0568f49e2543b2774",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html": [
-   "f366b0f28d087b46c7e1b8787012b0427a5c668e",
+  "mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
+   "5f6030ee661ead982d88e8fa281c0ff82bb72f2d",
    "testharness"
   ],
-  "mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html": [
-   "845e3332f83a552ba268bd369089cd408c5c9ed1",
+  "mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
+   "531546fa4c30f76ed51c7771b9dca10de58d2df0",
    "testharness"
   ],
-  "mixed-content/spec.src.json": [
-   "8cc85c890a853de3d538cc771e7bd7f3a55cfdfa",
-   "support"
-  ],
-  "mixed-content/spec_json.js": [
-   "2fd556b87de54659b3b02647c24fd4033c134ad7",
-   "support"
-  ],
   "navigation-timing/OWNERS": [
    "c2a3959eb05532a40371104542bef38946abb19b",
    "support"
@@ -566413,7 +565515,7 @@
    "testharness"
   ],
   "orientation-sensor/OrientationSensor_insecure_context.html": [
-   "700603c508503fe859502f334153aaa7f5e6f511",
+   "eb64da888f1bedf9d5ed8b11edc1626da88b322b",
    "testharness"
   ],
   "orientation-sensor/OrientationSensor_onerror-manual.https.html": [
@@ -566421,7 +565523,7 @@
    "manual"
   ],
   "orientation-sensor/idlharness.https.html": [
-   "9301519eebff3db962bbeb148bf3dd3b1e305a23",
+   "97f82793f2afe9ba9946f181380ad41d69f6524a",
    "testharness"
   ],
   "page-visibility/OWNERS": [
@@ -567061,7 +566163,7 @@
    "support"
   ],
   "pointerevents/pointerevent_support.js": [
-   "f2ab5ea976ffd62c669fda2db1484a4733ce5b28",
+   "e185e068ac229f2516e1345dd151090eb60d7950",
    "support"
   ],
   "pointerevents/pointerevent_suppress_compat_events_on_click-manual.html": [
@@ -567780,6 +566882,10 @@
    "00233e7d4513c8e3c4b7f7fa60f313ef1b6dbddd",
    "support"
   ],
+  "referrer-policy/generic/iframe-inheritance.html": [
+   "67531ab9869113d138d781ed8d0c92eefa08ec3b",
+   "testharness"
+  ],
   "referrer-policy/generic/link-rel-prefetch.html": [
    "96461340190f20f47a50b7fa4e6cdf9d2a7e09de",
    "testharness"
@@ -575244,8 +574350,8 @@
    "fe63f3ea133dbdb48b1a525a40d34a231e9a3789",
    "testharness"
   ],
-  "requestidlecallback/callback-timeout-with-raf.html": [
-   "febb81c38f530c81d9e9837df2c6d603225ecfd1",
+  "requestidlecallback/callback-timeout-when-busy.html": [
+   "bc78234c0fc6d793d755988643d09f5d56aedb48",
    "testharness"
   ],
   "requestidlecallback/callback-timeout.html": [
@@ -575261,7 +574367,7 @@
    "testharness"
   ],
   "requestidlecallback/idlharness.html": [
-   "520ee58982b43875f3caa08d7f46b9c6311be0b6",
+   "970dac3de43bddedb88e22c438fc01f76a6b9a41",
    "testharness"
   ],
   "requestidlecallback/resources/post_name_on_load.html": [
@@ -575513,11 +574619,11 @@
    "support"
   ],
   "secure-contexts/basic-dedicated-worker.html": [
-   "075f4170b133fe13e282ff5450871ef7960faf50",
+   "3e2dc8d37996552fc830ee6931f67091e83aa174",
    "testharness"
   ],
   "secure-contexts/basic-dedicated-worker.https.html": [
-   "05beced009e36f577a1393f80198158f3d37063c",
+   "13ce3f1a8ef03b87cca968fd3710d968f35a2439",
    "testharness"
   ],
   "secure-contexts/basic-popup-and-iframe-tests.html": [
@@ -575529,7 +574635,7 @@
    "testharness"
   ],
   "secure-contexts/basic-popup-and-iframe-tests.https.js": [
-   "26c7c307334b8a0e10265cf6fe3664d84cdd72cc",
+   "edc438d81762f199c6e7ffa7f638f74d9b6af701",
    "support"
   ],
   "secure-contexts/basic-shared-worker.html": [
@@ -575557,7 +574663,7 @@
    "testharness"
   ],
   "secure-contexts/shared-worker-secure-first.https.html": [
-   "38c411b3a8fa1acf9d87e4f68c58a52f54c3d379",
+   "cdb342e7b302d5a0bf7d282788f0e0292a486285",
    "testharness"
   ],
   "secure-contexts/support/dedicated-worker-script.js": [
@@ -575565,7 +574671,7 @@
    "support"
   ],
   "secure-contexts/support/https-subframe-dedicated.html": [
-   "5a9c1cee739efbad41f2ef6c4d70eda1f7b01646",
+   "a022992d2cf1ac230bcbbb988b3e83c94c50957e",
    "support"
   ],
   "secure-contexts/support/https-subframe-shared.html": [
@@ -575573,11 +574679,11 @@
    "support"
   ],
   "secure-contexts/support/parent-dedicated-worker-script.js": [
-   "f30fd69030eb48c6d98f07f0f61cf7c75410991f",
+   "f900be624e6fbecbbfc164439f25045bb0612996",
    "support"
   ],
   "secure-contexts/support/parent-shared-worker-script.js": [
-   "fe110557d01f13b1b62606bf39d4ed54ebb5eb23",
+   "a7b5ffa139addf2af9f40b088b8996e0a5a4d26d",
    "support"
   ],
   "secure-contexts/support/shared-worker-insecure-popup.html": [
@@ -575588,38 +574694,6 @@
    "c9b3ac77b8c62131dbe0f7228071fc6bf5e5e838",
    "support"
   ],
-  "security/support/window-name-navigation.sub.html": [
-   "f5e1ec7b0626f7f007bc75b66504bcc4ec47d4f2",
-   "support"
-  ],
-  "security/support/window-name-test.sub.html": [
-   "841e6ebed7f83a59b4942be07452ad5c9b8f6519",
-   "support"
-  ],
-  "security/window-name-after-cross-origin-aux-frame-navigation.sub.html": [
-   "16dfcc1f1628c9dab89470a421138ffde85e866a",
-   "testharness"
-  ],
-  "security/window-name-after-cross-origin-main-frame-navigation.sub.html": [
-   "74c59d584d8523ce523a26452767d6212d010234",
-   "testharness"
-  ],
-  "security/window-name-after-cross-origin-sub-frame-navigation.sub.html": [
-   "498803de18a2ac26f3d5bb19a470ad058cefa9ac",
-   "testharness"
-  ],
-  "security/window-name-after-same-origin-aux-frame-navigation.sub.html": [
-   "2b0496b919110cc5996c79afdd420905e1d48ea6",
-   "testharness"
-  ],
-  "security/window-name-after-same-origin-main-frame-navigation.sub.html": [
-   "74ec6353b0b0afa070c745125c09b91d870f38c7",
-   "testharness"
-  ],
-  "security/window-name-after-same-origin-sub-frame-navigation.sub.html": [
-   "8865745d26bee3955927f4c9d35a5174578238ce",
-   "testharness"
-  ],
   "selection/Document-open.html": [
    "31a5ee7a3619c62dbd35eafb66725bf4192639a0",
    "testharness"
@@ -576317,7 +575391,7 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-event.https.html": [
-   "8fb51ce7439e3b8ee21eb5bc8924b2db884fd412",
+   "22cfed652ec3779afae9ec77fda14ad0de9f03ba",
    "testharness"
   ],
   "service-workers/service-worker/fetch-frame-resource.https.html": [
@@ -576768,10 +575842,6 @@
    "785a18ac3c8001034f583a8e97195aa47093bd0d",
    "testharness"
   ],
-  "service-workers/service-worker/request-body-blob.https.html": [
-   "14dcf42e1dbfdc7589f9df64e2622cc599411174",
-   "testharness"
-  ],
   "service-workers/service-worker/request-end-to-end.https.html": [
    "ee9f8140b492daf89cb715643ee40557f6ed904e",
    "testharness"
@@ -577033,7 +576103,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/fetch-event-test-worker.js": [
-   "f9eab9a493f43ec5a8a662815a979e70fb3e3900",
+   "f42ca5c4f05c89df3bb37249ed4b09af0aae25be",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-event-within-sw-worker.js": [
@@ -577516,14 +576586,6 @@
    "7fb39d9609893a0fbcada161c92dc3df40721f90",
    "support"
   ],
-  "service-workers/service-worker/resources/request-body-blob-iframe.html": [
-   "b1f805a1120f3728a0e7accbc62041363e668ab0",
-   "support"
-  ],
-  "service-workers/service-worker/resources/request-body-blob-worker.js": [
-   "867de00970be85ce6fbe25c175191450eb83c906",
-   "support"
-  ],
   "service-workers/service-worker/resources/request-end-to-end-worker.js": [
    "984ea18286a9fa7446562a77284b942fa7e5217c",
    "support"
@@ -578049,7 +577111,7 @@
    "testharness"
   ],
   "shadow-dom/event-post-dispatch.html": [
-   "ab40bb984bbbf8acad097fee7bfe11302969ac0f",
+   "f728caa68d0112033fb599880404811b17596396",
    "testharness"
   ],
   "shadow-dom/event-with-related-target.html": [
@@ -578401,7 +577463,7 @@
    "testharness"
   ],
   "speech-api/OWNERS": [
-   "025f9f081f215505e0e55838d4afe136aba573cf",
+   "7022719dae5deb21ce300bb2af91b5eddcee62ff",
    "support"
   ],
   "speech-api/SpeechSynthesis-speak-ownership.html": [
@@ -582728,95 +581790,99 @@
    "fcc5e59095f69e8f62120e392d84de9f4c5647a2",
    "manual"
   ],
-  "viewport/viewport-attribute-event-handlers-manual.html": [
+  "visual-viewport/OWNERS": [
+   "6a97a4002074fd8dacc111e76d96bb48b5854909",
+   "support"
+  ],
+  "visual-viewport/viewport-attribute-event-handlers-manual.html": [
    "09901d9056f2e31f630becdd07f800e00496700a",
    "manual"
   ],
-  "viewport/viewport-dimensions-custom-scrollbars-manual.html": [
+  "visual-viewport/viewport-dimensions-custom-scrollbars-manual.html": [
    "ccef0829da2e4ebcad983235f97a6f3f767a0f51",
    "manual"
   ],
-  "viewport/viewport-dimensions-scrollbars-manual.html": [
+  "visual-viewport/viewport-dimensions-scrollbars-manual.html": [
    "465eb63a9f09880f98636502d4b3ee3b5e3ec794",
    "manual"
   ],
-  "viewport/viewport-no-resize-event-on-overflow-recalc.html": [
+  "visual-viewport/viewport-no-resize-event-on-overflow-recalc.html": [
    "f4d6cb3f76e4cf790875b3be90de821a279b3d82",
    "testharness"
   ],
-  "viewport/viewport-offset-manual.html": [
+  "visual-viewport/viewport-offset-manual.html": [
    "1d39d721a49e44d87583cb173cf0bba648fba352",
    "manual"
   ],
-  "viewport/viewport-page-manual.html": [
+  "visual-viewport/viewport-page-manual.html": [
    "1431cc6a8495343697c01ef62d237c31a5850e99",
    "manual"
   ],
-  "viewport/viewport-read-size-causes-layout.html": [
+  "visual-viewport/viewport-read-size-causes-layout.html": [
    "64a511ff2dd9c0381588b56b15fe1c82e0b1e07a",
    "testharness"
   ],
-  "viewport/viewport-read-size-in-iframe-causes-layout.html": [
+  "visual-viewport/viewport-read-size-in-iframe-causes-layout.html": [
    "8bf7b6c1a5721da2c1d1fc896d62a44893446a73",
    "testharness"
   ],
-  "viewport/viewport-resize-event-manual.html": [
+  "visual-viewport/viewport-resize-event-manual.html": [
    "38280c144ed74af990ebf9b65ad1d68052f93372",
    "manual"
   ],
-  "viewport/viewport-resize-event-on-load-overflowing-page.html": [
+  "visual-viewport/viewport-resize-event-on-load-overflowing-page.html": [
    "cd13682091b00c182e570a87eac642613a3c05c2",
    "testharness"
   ],
-  "viewport/viewport-scale-iframe-manual.html": [
+  "visual-viewport/viewport-scale-iframe-manual.html": [
    "4ccf4a4bb7d13bc12afc6d9bbbc8072b460f87ec",
    "manual"
   ],
-  "viewport/viewport-scale-manual.html": [
+  "visual-viewport/viewport-scale-manual.html": [
    "fd089f974778969d95cd7f6aa6389a6cf9dfb543",
    "manual"
   ],
-  "viewport/viewport-scroll-event-manual.html": [
+  "visual-viewport/viewport-scroll-event-manual.html": [
    "43e7031d3734a1c377e64d0f6a8247fef0782ceb",
    "manual"
   ],
-  "viewport/viewport-scrollbars-cause-resize.html": [
+  "visual-viewport/viewport-scrollbars-cause-resize.html": [
    "a1017cff8faadfdcae008fd5f27e9c8e7c5383d3",
    "testharness"
   ],
-  "viewport/viewport-type.html": [
+  "visual-viewport/viewport-type.html": [
    "45334f4775607cd8547788e4107e81b03fad319f",
    "testharness"
   ],
-  "viewport/viewport-unscaled-scale-iframe.html": [
+  "visual-viewport/viewport-unscaled-scale-iframe.html": [
    "d88c0bd1ce525137fb739182a35ae22bd6455c0f",
    "testharness"
   ],
-  "viewport/viewport-unscaled-scale.html": [
+  "visual-viewport/viewport-unscaled-scale.html": [
    "eb5a1e32e015808651f008ebaaa785ec84d7a1f3",
    "testharness"
   ],
-  "viewport/viewport-unscaled-scroll-iframe.html": [
+  "visual-viewport/viewport-unscaled-scroll-iframe.html": [
    "14e88914da4ce92b90cb191278aaa0a26e00ee7a",
    "testharness"
   ],
-  "viewport/viewport-unscaled-scroll.html": [
+  "visual-viewport/viewport-unscaled-scroll.html": [
    "12f4366f75a8fb078e1691c3ad091ea15a8561f9",
    "testharness"
   ],
-  "viewport/viewport-unscaled-size-iframe.html": [
+  "visual-viewport/viewport-unscaled-size-iframe.html": [
    "937198c3bf9f26413c35e48f90b5b3b35e1c96a2",
    "testharness"
   ],
-  "viewport/viewport-unscaled-size.html": [
+  "visual-viewport/viewport-unscaled-size.html": [
    "e92beb18c8adcf1f7d89cfa0512df46765440a5a",
    "testharness"
   ],
-  "viewport/viewport-url-bar-changes-height-manual.html": [
+  "visual-viewport/viewport-url-bar-changes-height-manual.html": [
    "6b7e0dfc4b8bf51f7e5799a3089c2263e6dac63d",
    "manual"
   ],
-  "viewport/viewport_support.js": [
+  "visual-viewport/viewport_support.js": [
    "2e2e9480e8ccca07d4334d957b6a1c597a1f8fbd",
    "support"
   ],
@@ -582833,7 +581899,7 @@
    "manual"
   ],
   "wai-aria/alertdialog_modal_true-manual.html": [
-   "b5e55fb9f84d41d49b6d464ff838e6bf93e89d32",
+   "1cc6b8748e46ffbeaaf19123d489895049831393",
    "manual"
   ],
   "wai-aria/application_activedescendant-manual.html": [
@@ -583125,7 +582191,7 @@
    "manual"
   ],
   "wai-aria/dialog_modal_true-manual.html": [
-   "4f5282509f1bb49968e270ccbb7d436925d6ad45",
+   "55dcbad3c1757ffa5fd666c4362ddbc499224064",
    "manual"
   ],
   "wai-aria/dialog_modal_unspecified-manual.html": [
@@ -583752,6 +582818,14 @@
    "e82b65811aa337b03cfe72d25215c29234b798dd",
    "manual"
   ],
+  "wake-lock/OWNERS": [
+   "92dc52582d366bafcdb1bbd1cc68f109c0ae8813",
+   "support"
+  ],
+  "wake-lock/interfaces.https.html": [
+   "0dbbfa77dc7e17f2dfcaecd3899f37da51b4055a",
+   "testharness"
+  ],
   "wasm/compile_worker.js": [
    "652193b876206d7a0f361f145469a604d03e3784",
    "support"
@@ -583973,7 +583047,7 @@
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffectTiming/iterationStart.html": [
-   "1ddaceeb8b5e3fc93e5bf4dc1136e8714a08f474",
+   "05e327706937df8319e3a8c655ee743a15902ecd",
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffectTiming/iterations.html": [
@@ -584041,7 +583115,7 @@
    "support"
   ],
   "web-animations/resources/effect-tests.js": [
-   "aed87c03ac50e534532855612a7bb05092a7e4e7",
+   "5cdc52caac1d1db2249155e91591c983a746102e",
    "support"
   ],
   "web-animations/resources/keyframe-utils.js": [
@@ -584272,6 +583346,34 @@
    "230684ec60fd2e408f9b6014417f3eddfe2dc95a",
    "support"
   ],
+  "webaudio/chrome/resources/audioparam-testing.js": [
+   "2855fbee30e629ea397166911b9bcdec74bd4fdf",
+   "support"
+  ],
+  "webaudio/chrome/resources/audit-util.js": [
+   "4405458b8f8bdc621c95c1d9ec1c1ad4e6002f1e",
+   "support"
+  ],
+  "webaudio/chrome/resources/audit.js": [
+   "7f7051364808eadc207207a7dadcc191a95a2db3",
+   "support"
+  ],
+  "webaudio/chrome/resources/start-stop-exceptions.js": [
+   "70e0f890a721786f8afa4cd032e75ef85b5fc6bb",
+   "support"
+  ],
+  "webaudio/chrome/the-constantsourcenode-interface/constant-source-basic.html": [
+   "7c9fed4798e8119ca3cedda3958788fe989d4dd4",
+   "testharness"
+  ],
+  "webaudio/chrome/the-constantsourcenode-interface/constant-source-onended.html": [
+   "10f6b84a4c8de1a8b689cc443f2526b0455a4d27",
+   "testharness"
+  ],
+  "webaudio/chrome/the-constantsourcenode-interface/constant-source-output.html": [
+   "ff83b807b7a39fa40ad3df8db42c20eb859f34a8",
+   "testharness"
+  ],
   "webaudio/historical.html": [
    "93068df297042344669093ce899f0230c87ebf54",
    "testharness"
@@ -584569,7 +583671,7 @@
    "support"
   ],
   "webdriver/tests/conftest.py": [
-   "ab95734024a8e152ed84128eb804344740be91d4",
+   "c812269d034c9ca1b8c4f136dd5d0cea52f4d0f0",
    "support"
   ],
   "webdriver/tests/contexts/json_serialize_windowproxy.py": [
@@ -584577,7 +583679,7 @@
    "wdspec"
   ],
   "webdriver/tests/contexts/maximize_window.py": [
-   "904dd1db0e9731148a1793065b1d38acf0ac094b",
+   "7912e2f7ebdffe2598eb3b9a20f4fc7fce22447e",
    "wdspec"
   ],
   "webdriver/tests/contexts/resizing_and_positioning.py": [
@@ -584589,7 +583691,7 @@
    "wdspec"
   ],
   "webdriver/tests/cookies/delete_cookie.py": [
-   "4e846b0f0538bbfc88e7dc6b637f19260a8d3c3e",
+   "451cef1c071f67bc2bc1666a906b4c289b700d22",
    "wdspec"
   ],
   "webdriver/tests/cookies/get_named_cookie.py": [
@@ -584605,19 +583707,19 @@
    "wdspec"
   ],
   "webdriver/tests/element_retrieval/get_active_element.py": [
-   "9080770b60a988cb37e30700efb118d392a896c7",
+   "131cfaf18ba1476c15866e25e5de65143d5269e0",
    "wdspec"
   ],
   "webdriver/tests/fullscreen_window.py": [
-   "6b1e481aac6856b6e858df17731d037997b99f83",
+   "817011a8cdff7cfd7e445fb8ecb84e5d91f03993",
    "wdspec"
   ],
   "webdriver/tests/get_window_rect.py": [
-   "0dc9c8cc1332907be819d52feb7c94f4b1cc928a",
+   "5d907b2a16b9ff7dba8e39bba19ea7f85f29f71e",
    "wdspec"
   ],
   "webdriver/tests/interaction/send_keys_content_editable.py": [
-   "130c57e80a0738ed500f59b0178753f8acaf15bf",
+   "9c071e60e1203cf31120f20874b5f38ba41dacc3",
    "wdspec"
   ],
   "webdriver/tests/interface.html": [
@@ -584625,7 +583727,7 @@
    "testharness"
   ],
   "webdriver/tests/minimize_window.py": [
-   "e0950b165c0cbf76e8adcd865176ea164a1ea768",
+   "ac1df5462702ac368ffa92cc12cfb5e34df226ac",
    "wdspec"
   ],
   "webdriver/tests/navigation/current_url.py": [
@@ -584633,7 +583735,7 @@
    "wdspec"
   ],
   "webdriver/tests/navigation/get_title.py": [
-   "11c84957a3177acbbf34597bc0defb3f77c5744c",
+   "4609f17922cc9680c41b8972dafb827195037ff8",
    "wdspec"
   ],
   "webdriver/tests/retrieval/__init__.py": [
@@ -584665,35 +583767,39 @@
    "support"
   ],
   "webdriver/tests/sessions/new_session/create_alwaysMatch.py": [
-   "e4dd4fe4ab30d71e9fe383daf2ca00582615ec35",
+   "84f8ad0908e9ec787f9db73ff66cbe193c2c9626",
    "wdspec"
   ],
   "webdriver/tests/sessions/new_session/create_firstMatch.py": [
-   "6fd2671870cd3451aab6f81ea19bd516a6c82bc9",
+   "fbdabf1852c07db0f5df2d47954c1cd5d7285492",
    "wdspec"
   ],
   "webdriver/tests/sessions/new_session/default_values.py": [
-   "d0802053ea0e1c81304b985821c743727b5222ec",
+   "92c26366f8fd0d37587457b9b5a630df4b19cc60",
    "wdspec"
   ],
   "webdriver/tests/sessions/new_session/invalid_capabilities.py": [
-   "20e143186f39022c0a8cf6218b08a2fe22f96153",
+   "4caa08542f61ebe73c020d15d559704af037a97c",
    "wdspec"
   ],
   "webdriver/tests/sessions/new_session/merge.py": [
-   "e58b671da735c6040248c80a3384760ee4496c88",
+   "000b28631bb6d862b654f1f998852f5f1a6b2e12",
    "wdspec"
   ],
   "webdriver/tests/sessions/new_session/response.py": [
-   "3eca8e1d571b0c94b2a08fccfbe8cb9f1b1ba6d5",
+   "973f5deb240dd01f6213252e6d9fc2f462b0e035",
    "wdspec"
   ],
+  "webdriver/tests/sessions/new_session/support/__init__.py": [
+   "ba8ab5a0280b953aa97435ff8946cbcbb2755a27",
+   "support"
+  ],
   "webdriver/tests/sessions/new_session/support/create.py": [
    "440d88462cc418e4d5e1df6f73074d3a722bd2fd",
    "support"
   ],
   "webdriver/tests/set_window_rect.py": [
-   "e84559c2ee94009fe808c3008c58e6e4b9ca27aa",
+   "8a124f80e6e7732a651a80da3f6cdf8e2ed99e3e",
    "wdspec"
   ],
   "webdriver/tests/state/__init__.py": [
@@ -584701,19 +583807,19 @@
    "support"
   ],
   "webdriver/tests/state/get_element_attribute.py": [
-   "1e25aaf5c3ab4c24130566d7823830a11a86393d",
+   "cad153b432a69597b0da6449765df11538c51fe6",
    "wdspec"
   ],
   "webdriver/tests/state/get_element_property.py": [
-   "2d4e145cd55c6ee0ed69c617c77975e295e56119",
+   "b7bbb822cdb22d74a57706f6a353fe55a068c7dd",
    "wdspec"
   ],
   "webdriver/tests/state/get_element_tag_name.py": [
-   "ed23abfb5a1e9d3afdf168c722e7b64827c176ec",
+   "3b8ecaaef3c04b34045ba5c32d2988aef299da17",
    "wdspec"
   ],
   "webdriver/tests/state/is_element_selected.py": [
-   "77b93dd58e0fb4f504c94bc39013d6ada59126bc",
+   "386579b289b6288cbeba71c839ac6569310e09dd",
    "wdspec"
   ],
   "webdriver/tests/state/text/__init__.py": [
@@ -584737,7 +583843,7 @@
    "support"
   ],
   "webdriver/tests/support/fixtures.py": [
-   "4b68fd0f02cc88e9abb422c2c3978812edbbbec7",
+   "765dd3821da0724024cdd61523f3d2fd79e8be28",
    "support"
   ],
   "webdriver/tests/support/http_request.py": [
@@ -594152,6 +593258,10 @@
    "f53e7687ad6aef0ffc064d941a05a222c33fde56",
    "testharness"
   ],
+  "webmessaging/Channel_postMessage_Blob.htm": [
+   "9667a479d4ed3f01dd052567a67256c20a533074",
+   "testharness"
+  ],
   "webmessaging/Channel_postMessage_DataCloneErr.htm": [
    "a62fdac80932ca059c8853ca9a9f8edd13926f86",
    "testharness"
@@ -594221,7 +593331,7 @@
    "testharness"
   ],
   "webmessaging/broadcastchannel/blobs.html": [
-   "59839a75b7da8316df81e2c98b1ecc73ffd8d02e",
+   "6783e7192e63a0418d65885715baa3ba1c99e33a",
    "testharness"
   ],
   "webmessaging/broadcastchannel/interface.html": [
@@ -594241,7 +593351,7 @@
    "support"
   ],
   "webmessaging/broadcastchannel/resources/worker.js": [
-   "9376237db37ad66df2cddec3b38e18b74681500b",
+   "d870e4e7ca81044bd62ddbf79fb666d02bc5b9ee",
    "support"
   ],
   "webmessaging/broadcastchannel/sandbox.html": [
@@ -594725,7 +593835,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-helper.js": [
-   "e3b2656366be168b5f2e3cde9461a4e69a51c9ef",
+   "d579dd68118d72c06455d8ccdbeb666f8f39c58a",
    "support"
   ],
   "webrtc/RTCPeerConnection-iceConnectionState.html": [
@@ -594789,7 +593899,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setRemoteDescription-offer.html": [
-   "ce5345bbaf5b5230b1fd53bbb55ab4439c3eb979",
+   "34337ef2126bfe276675db8884cd2a9aaa2d4432",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setRemoteDescription-pranswer.html": [
@@ -594800,6 +593910,10 @@
    "6142a9b3b95bb26634af5300bc24981f2b4cb2a4",
    "testharness"
   ],
+  "webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html": [
+   "5d6a2f62f455c086222f8ea4ba8fdde4134766cc",
+   "testharness"
+  ],
   "webrtc/RTCPeerConnection-setRemoteDescription.html": [
    "2a2e3f9ff0a5912fa260d7124f7f5a9c3862c533",
    "testharness"
@@ -594921,7 +594035,7 @@
    "support"
   ],
   "webrtc/getstats.html": [
-   "6656998d4adfab0e6ca51c98cd141cf162d3879c",
+   "4c47dcbadf09fdaecafc3ddcabd5510975dd5154",
    "testharness"
   ],
   "webrtc/historical.html": [
@@ -594932,7 +594046,7 @@
    "c7639c627cceaad0e122d83ccde429d044c0773d",
    "support"
   ],
-  "webrtc/interfaces.html": [
+  "webrtc/interfaces.https.html": [
    "efd0c4a62b9c90f27da1188c30e4503755e7f8d2",
    "testharness"
   ],
@@ -595061,7 +594175,7 @@
    "support"
   ],
   "websockets/README.md": [
-   "1b8473c8d482b7628fc7337e263c78aca7ca5088",
+   "42c6183f2b71442d96a023f2c05ab6ed10f06180",
    "support"
   ],
   "websockets/Secure-Close-1000-reason.htm": [
@@ -600125,11 +599239,19 @@
    "support"
   ],
   "worklets/animation-worklet-import.html": [
-   "42ad4c05fb7093051344351c7b8802f8ef8fbf4c",
+   "6e92613e720ac1fa1cdec91665cc1ca68a6e0bc8",
+   "testharness"
+  ],
+  "worklets/animation-worklet-referrer.html": [
+   "7c6e4a94815093e9353d184b877046ad7627bae9",
    "testharness"
   ],
   "worklets/paint-worklet-import.html": [
-   "0319b5195ba14348c6b5031d1198c5f401d13938",
+   "a1a5fe53abb00fe37c7688032038110a67f988ee",
+   "testharness"
+  ],
+  "worklets/paint-worklet-referrer.html": [
+   "86e7c0fe4de0764a7064ed22eef2b66ab09d4a62",
    "testharness"
   ],
   "worklets/resources/empty-worklet-script.js": [
@@ -600149,13 +599271,29 @@
    "support"
   ],
   "worklets/resources/import-tests.js": [
-   "7fd020b68f1ef3fc0bf8d057d30af3970f9b06cd",
+   "62d2e0030328c0d0f64ccfff2402634a3e99c637",
+   "support"
+  ],
+  "worklets/resources/referrer-tests.js": [
+   "47d8ae6d90b88ab8fb856e305b1599a34173852f",
+   "support"
+  ],
+  "worklets/resources/referrer-window.html": [
+   "d098da333b3c3c27999c7436af5e2f986bf9df28",
+   "support"
+  ],
+  "worklets/resources/referrer.py": [
+   "ed296faa934f89efcca9a116f6a2e931cafd831e",
    "support"
   ],
   "worklets/resources/throwing-worklet-script.js": [
    "a7164f899afec387321c7737aa1006aa5f225669",
    "support"
   ],
+  "worklets/resources/worklet-test-utils.js": [
+   "f05d557ba57bca35228a5ebbc418816cc3d01ee4",
+   "support"
+  ],
   "x-frame-options/deny.sub.html": [
    "5a589f4b4c6f2503104b33ae7002dcc5c4153eb7",
    "testharness"
diff --git a/tests/wpt/metadata/fetch/api/basic/keepalive.html.ini b/tests/wpt/metadata/fetch/api/basic/keepalive.html.ini
new file mode 100644
index 0000000000000..48cea424a0170
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/basic/keepalive.html.ini
@@ -0,0 +1,4 @@
+[keepalive.html]
+  [Fetch API: keepalive handling]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/request/request-keepalive.html.ini b/tests/wpt/metadata/fetch/api/request/request-keepalive.html.ini
new file mode 100644
index 0000000000000..1f86b6d1e4612
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/request/request-keepalive.html.ini
@@ -0,0 +1,7 @@
+[request-keepalive.html]
+  [keepalive flag]
+    expected: FAIL
+
+  [keepalive flag with stream body]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 8cfae61d852a5..3051268001961 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -14307,3 +14307,12 @@
   [External interface: window.external must inherit property "IsSearchProviderInstalled()" with the proper type]
     expected: FAIL
 
+  [HTMLIFrameElement interface: attribute delegateStickyUserActivation]
+    expected: FAIL
+
+  [History interface: attribute index]
+    expected: FAIL
+
+  [History interface: window.history must inherit property "index" with the proper type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html.ini
new file mode 100644
index 0000000000000..ea83e6cce787c
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html.ini
@@ -0,0 +1,4 @@
+[dialog-return-value.html]
+  [Tests dialog.returnValue is settable and returns the last value set.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html.ini
new file mode 100644
index 0000000000000..502475f251425
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html.ini
@@ -0,0 +1,5 @@
+[show-modal-focusing-steps.html]
+  expected: TIMEOUT
+  [focus when a modal dialog is opened]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html.ini
deleted file mode 100644
index e7cc3d494f10a..0000000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[dynamic-imports-error.html]
-  type: testharness
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html.ini
new file mode 100644
index 0000000000000..9d70161670265
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html.ini
@@ -0,0 +1,2 @@
+[dynamic-imports-fetch-error.sub.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html.ini
new file mode 100644
index 0000000000000..803eee6278c4b
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html.ini
@@ -0,0 +1,2 @@
+[dynamic-imports-script-error.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html.ini
new file mode 100644
index 0000000000000..f4f4373816c59
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html.ini
@@ -0,0 +1,2 @@
+[import-meta-url.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/mozilla-sync b/tests/wpt/metadata/mozilla-sync
index 85551d7f16ecc..71a0af8528511 100644
--- a/tests/wpt/metadata/mozilla-sync
+++ b/tests/wpt/metadata/mozilla-sync
@@ -1,2 +1,2 @@
-local: 20a833eb75e92c3f7dd081bf526d8d8fbaf618ef
-upstream: 238e9855c35a3570f824b837826aac71e50722f4
+local: 1b73cf33525afbbe2d077554d1965b74ef9ae5e3
+upstream: 3922fb3e43b75d2ff118a5ebf793180f570fdb53
diff --git a/tests/wpt/metadata/referrer-policy/generic/iframe-inheritance.html.ini b/tests/wpt/metadata/referrer-policy/generic/iframe-inheritance.html.ini
new file mode 100644
index 0000000000000..dae4704bef01b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/iframe-inheritance.html.ini
@@ -0,0 +1,5 @@
+[iframe-inheritance.html]
+  expected: TIMEOUT
+  [iframes correctly inherit the ancestor's referrer]
+    expected: NOTRUN
+
diff --git a/tests/wpt/mozilla/tests/css/test_font_family_parsing.html b/tests/wpt/mozilla/tests/css/test_font_family_parsing.html
index 20114ed597812..fb43bee5635fd 100644
--- a/tests/wpt/mozilla/tests/css/test_font_family_parsing.html
+++ b/tests/wpt/mozilla/tests/css/test_font_family_parsing.html
@@ -127,17 +127,6 @@
 
 ];
 
-if (window.SpecialPowers && SpecialPowers.getBoolPref("layout.css.unset-value.enabled")) {
-  testFontFamilyLists.push(
-    { namelist: "unset", invalid: true, fontonly: true, single: true },
-    { namelist: "unset, simple", invalid: true },
-    { namelist: "simple, unset", invalid: true },
-    { namelist: "simple, unset bongo" },
-    { namelist: "simple, bongo unset" },
-    { namelist: "simple unset", single: true },
-    { namelist: "unset simple", single: true });
-}
-
 var gTest = 0;
 
 /* strip out just values */
diff --git a/tests/wpt/web-platform-tests/.travis.yml b/tests/wpt/web-platform-tests/.travis.yml
index 1cdc87ec4c521..43aacf5d8c3f4 100644
--- a/tests/wpt/web-platform-tests/.travis.yml
+++ b/tests/wpt/web-platform-tests/.travis.yml
@@ -24,6 +24,15 @@ env:  # required at the top-level for allow_failures to work below
 matrix:
   fast_finish: true
   include:
+    - os: linux
+      python: "2.7"
+      env: JOB=manifest_upload SCRIPT=tools/ci/ci_manifest.sh
+      deploy:
+        provider: releases
+        api_key:
+          secure: "EljDx50oNpDLs7rzwIv+z1PxIgB5KMnx1W0OQkpNvltR0rBW9g/aQaE+Z/c8M/sPqN1bkvKPybKzGKjb6j9Dw3/EJhah4SskH78r3yMAe2DU/ngxqqjjfXcCc2t5MKxzHAILTAxqScPj2z+lG1jeK1Z+K5hTbSP9lk+AvS0D16w="
+        file: $WPT_MANIFEST_FILE.gz
+        skip_cleanup: true
     - os: linux
       python: "2.7"
       env: JOB=lint SCRIPT=tools/ci/ci_lint.sh
diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-request-source.html b/tests/wpt/web-platform-tests/IndexedDB/idbcursor-request-source.html
new file mode 100644
index 0000000000000..9216a0c4416b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/IndexedDB/idbcursor-request-source.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>IndexedDB: The source of requests made against cursors</title>
+<meta name="help" href="https://w3c.github.io/IndexedDB/#dom-idbrequest-source">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support.js"></script>
+<script>
+
+[
+  cursor => cursor.update(0),
+  cursor => cursor.delete()
+].forEach(func => indexeddb_test(
+  (t, db) => {
+    db.createObjectStore('store', {autoIncrement: true});
+  },
+  (t, db) => {
+    const tx = db.transaction('store', 'readwrite');
+    const store = tx.objectStore('store');
+    store.put('value');
+    store.openCursor().onsuccess = t.step_func(e => {
+      const cursor = e.target.result;
+      assert_equals(func(cursor).source, cursor,
+                    `${func}.source should be the cursor itself`);
+      t.done();
+    });
+  },
+  `The source of the request from ${func} is the cursor itself`
+));
+
+</script>
diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-request-source.html b/tests/wpt/web-platform-tests/IndexedDB/idbindex-request-source.html
new file mode 100644
index 0000000000000..3788eff054665
--- /dev/null
+++ b/tests/wpt/web-platform-tests/IndexedDB/idbindex-request-source.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>IndexedDB: The source of requests made against indexes</title>
+<meta name="help" href="https://w3c.github.io/IndexedDB/#dom-idbrequest-source">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support.js"></script>
+<script>
+
+[
+  index => index.get(0),
+  index => index.getKey(0),
+  index => index.getAll(),
+  index => index.getAllKeys(),
+  index => index.count(),
+
+  index => index.openCursor(),
+  index => index.openKeyCursor()
+].forEach(func => indexeddb_test(
+  (t, db) => {
+    const store = db.createObjectStore('store', {autoIncrement: true});
+    store.createIndex('index', 'kp');
+  },
+  (t, db) => {
+    const tx = db.transaction('store', 'readwrite');
+    const index = tx.objectStore('store').index('index');
+    assert_equals(func(index).source, index,
+                  `${func}.source should be the index itself`);
+    t.done();
+  },
+  `The source of the request from ${func} is the index itself`
+));
+
+</script>
diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-request-source.html b/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-request-source.html
new file mode 100644
index 0000000000000..32bf370ab60ca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-request-source.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>IndexedDB: The source of requests made against object stores</title>
+<meta name="help" href="https://w3c.github.io/IndexedDB/#dom-idbrequest-source">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support.js"></script>
+<script>
+
+[
+  store => store.put(0),
+  store => store.add(0),
+  store => store.delete(0),
+  store => store.clear(),
+
+  store => store.get(0),
+  store => store.getKey(0),
+  store => store.getAll(),
+  store => store.getAllKeys(),
+  store => store.count(),
+
+  store => store.openCursor(),
+  store => store.openKeyCursor()
+].forEach(func => indexeddb_test(
+  (t, db) => {
+    db.createObjectStore('store', {autoIncrement: true});
+  },
+  (t, db) => {
+    const tx = db.transaction('store', 'readwrite');
+    const store = tx.objectStore('store');
+
+    assert_equals(func(store).source, store,
+                  `${func}.source should be the object store itself`);
+    t.done();
+  },
+  `The source of the request from ${func} is the object store itself`
+));
+
+</script>
diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer_insecure_context.html b/tests/wpt/web-platform-tests/accelerometer/Accelerometer_insecure_context.html
index 4ff4789c37e8e..d55a62f18e7fc 100644
--- a/tests/wpt/web-platform-tests/accelerometer/Accelerometer_insecure_context.html
+++ b/tests/wpt/web-platform-tests/accelerometer/Accelerometer_insecure_context.html
@@ -15,6 +15,6 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorInsecureContext(Accelerometer);
+runGenericSensorInsecureContext("Accelerometer");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/accelerometer/idlharness.https.html b/tests/wpt/web-platform-tests/accelerometer/idlharness.https.html
index b6d9ce5599483..f77400f8bac98 100644
--- a/tests/wpt/web-platform-tests/accelerometer/idlharness.https.html
+++ b/tests/wpt/web-platform-tests/accelerometer/idlharness.https.html
@@ -24,6 +24,7 @@
 [SecureContext, Exposed=Window]
 interface Sensor : EventTarget {
   readonly attribute boolean activated;
+  readonly attribute boolean hasReading;
   readonly attribute DOMHighResTimeStamp? timestamp;
   void start();
   void stop();
@@ -34,9 +35,9 @@
 
 [Constructor(optional SensorOptions options), Exposed=Window]
 interface Accelerometer : Sensor {
-  readonly attribute unrestricted double? x;
-  readonly attribute unrestricted double? y;
-  readonly attribute unrestricted double? z;
+  readonly attribute double? x;
+  readonly attribute double? y;
+  readonly attribute double? z;
 };
 
 [Constructor(optional SensorOptions options), Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/acid/README.md b/tests/wpt/web-platform-tests/acid/README.md
new file mode 100644
index 0000000000000..490f272df9c74
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/README.md
@@ -0,0 +1,17 @@
+## The Acid Tests
+
+This directory contains copies of Acid2 and Acid3, based on the
+copies hosted at [acidtests.org](http://www.acidtests.org) after they
+had ceased being maintained (per the note on that page).
+
+Note these are not maintained here for the sake of providing any
+useful guide of interoperability or standards compliance, but rather
+for browser vendors' convenience. It would be inappropriate,
+therefore, to use them as part of a certification process.
+
+Acid1 can be found at `css/CSS2/css1/c5526c-display-000.xht`, as it
+always formed part of the CSS1 testsuite.
+
+The tests themselves (i.e., those at `/` of their respective
+subdomains at `acidtests.org`) are in files named test.html in their
+respective directories.
diff --git a/tests/wpt/web-platform-tests/acid/acid2/404.html b/tests/wpt/web-platform-tests/acid/acid2/404.html
new file mode 100644
index 0000000000000..a17f4ecb85ab3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid2/404.html
@@ -0,0 +1,2 @@
+<style>body { background: red; }</style>
+
diff --git a/tests/wpt/web-platform-tests/acid/acid2/reference.html b/tests/wpt/web-platform-tests/acid/acid2/reference.html
new file mode 100755
index 0000000000000..66eed5ae3553c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid2/reference.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+ <head>
+  <title>The Second Acid Test (Reference Rendering)</title>
+  <style type="text/css">
+   html { margin: 0; padding: 0; border: 0; overflow: hidden; background: white; }
+   body { margin: 0; padding: 0; border: 0; }
+   h2 { margin: 0; padding: 48px 0 36px 84px; border: 0; font: 24px/24px sans-serif; color: navy; }
+   p { margin: 0; padding: 0 0 0 72px; border: 0; }
+   img { vertical-align: top; margin: 0; padding: 0; border: 0; }
+  </style>
+ </head>
+ <body>
+  <h2>Hello&nbsp;World!</h2>
+  <p><a href="reference.png"><img src="reference.png" alt="Follow this link to view the reference image, which should be rendered below the text &quot;Hello World!&quot; on the test page in the same way that this paragraph is rendered below that text on this page."></a></p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/acid/acid2/reference.png b/tests/wpt/web-platform-tests/acid/acid2/reference.png
new file mode 100755
index 0000000000000000000000000000000000000000..7aee7609d6ade6e39ad53b04a9f61e55f3b00c76
GIT binary patch
literal 2261
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

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/acid/acid2/reftest.html b/tests/wpt/web-platform-tests/acid/acid2/reftest.html
new file mode 100644
index 0000000000000..0f9b9ac023535
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid2/reftest.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<title>Acid2 reftest</title>
+<link rel="match" href="reference.html">
+<style>
+* {
+  margin: 0;
+  padding: 0;
+  border: 0;
+}
+iframe {
+  width: 400px;
+  height: 300px;
+}
+</style>
+<iframe src="test.html#top"></iframe>
diff --git a/tests/wpt/web-platform-tests/acid/acid2/test.html b/tests/wpt/web-platform-tests/acid/acid2/test.html
new file mode 100755
index 0000000000000..0407bac5dc45a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid2/test.html
@@ -0,0 +1,150 @@
+<!--
+A guide to Acid2 was posted alongside it as part of its original announcement; this can be found at:
+https://www.webstandards.org/action/acid2/guide/
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+ <head>
+  <title>The Second Acid Test</title>
+  <style type="text/css">
+   /* section numbers refer to CSS2.1 */
+
+   /* page setup */
+   html { font: 12px sans-serif; margin: 0; padding: 0; overflow: hidden; /* hides scrollbars on viewport, see 11.1.1:3 */ background: white; color: red; }
+   body { margin: 0; padding: 0; }
+
+   /* introduction message */
+   .intro { font: 2em sans-serif; margin: 3.5em 2em; padding: 0.5em; border: solid thin; background: white; color: black; position: relative; z-index: 2; /* should cover the black and red bars that are fixed-positioned */ }
+   .intro * { font: inherit; margin: 0; padding: 0; }
+   .intro h1 { font-size: 1em; font-weight: bolder; margin: 0; padding: 0; }
+   .intro :link { color: blue; }
+   .intro :visited { color: purple; }
+
+   /* picture setup */
+   #top { margin: 100em 3em 0; padding: 2em 0 0 .5em; text-align: left; font: 2em/24px sans-serif; color: navy; white-space: pre; } /* "Hello World!" text */
+   .picture { position: relative; border: 1em solid transparent; margin: 0 0 100em 3em; } /* containing block for face */
+   .picture { background: red; } /* overriden by preferred stylesheet below */
+
+   /* top line of face (scalp): fixed positioning and min/max height/width */
+   .picture p { position: fixed; margin: 0; padding: 0; border: 0; top: 9em; left: 11em; width: 140%; max-width: 4em; height: 8px; min-height: 1em; max-height: 2mm; /* min-height overrides max-height, see 10.7 */ background: black; border-bottom: 0.5em yellow solid; }
+
+   /* bits that shouldn't be part of the top line (and shouldn't be visible at all): HTML parsing, "+" combinator, stacking order */
+   .picture p.bad { border-bottom: red solid; /* shouldn't matter, because the "p + table + p" rule below should match it too, thus hiding it */ }
+   .picture p + p { background: maroon; z-index: 1; } /* shouldn't match anything */
+   .picture p + table + p { margin-top: 3em; /* should end up under the absolutely positioned table below, and thus not be visible */ }
+
+   /* second line of face: attribute selectors, float positioning */
+   [class~=one].first.one { position: absolute; top: 0; margin: 36px 0 0 60px; padding: 0; border: black 2em; border-style: none solid; /* shrink wraps around float */ }
+   [class~=one][class~=first] [class=second\ two][class="second two"] { float: right; width: 48px; height: 12px; background: yellow; margin: 0; padding: 0; } /* only content of abs pos block */
+
+   /* third line of face: width and overflow */
+   .forehead { margin: 4em; width: 8em; border-left: solid black 1em; border-right: solid black 1em; background: red url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC); /* that's a 1x1 yellow pixel PNG */ }
+   .forehead * { width: 12em; line-height: 1em; }
+
+   /* class selectors headache */
+   .two.error.two { background: maroon; } /* shouldn't match */
+   .forehead.error.forehead { background: red; } /* shouldn't match */
+   [class=second two] { background: red; } /* this should be ignored (invalid selector -- grammar says it only accepts IDENTs or STRINGs) */
+
+   /* fourth and fifth lines of face, with eyes: paint order test (see appendix E) and fixed backgrounds */
+   /* the two images are identical: 2-by-2 squares with the top left
+      and bottom right pixels set to yellow and the other two set to
+      transparent. Since they are offset by one pixel from each other,
+      the second one paints exactly over the transparent parts of the
+      first one, thus creating a solid yellow block. */
+   .eyes { position: absolute; top: 5em; left: 3em; margin: 0; padding: 0; background: red; }
+   #eyes-a { height: 0; line-height: 2em; text-align: right; } /* contents should paint top-most because they're inline */
+   #eyes-a object { display: inline; vertical-align: bottom; }
+   #eyes-a object[type] { width: 7.5em; height: 2.5em; } /* should have no effect since that object should fallback to being inline (height/width don't apply to inlines) */
+   #eyes-a object object object { border-right: solid 1em black; padding: 0 12px 0 11px; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAABnRSTlMAAAAAAABupgeRAAAABmJLR0QA%2FwD%2FAP%2BgvaeTAAAAEUlEQVR42mP4%2F58BCv7%2FZwAAHfAD%2FabwPj4AAAAASUVORK5CYII%3D) fixed 1px 0; }
+   #eyes-b { float: left; width: 10em; height: 2em; background: fixed url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAABnRSTlMAAAAAAABupgeRAAAABmJLR0QA%2FwD%2FAP%2BgvaeTAAAAEUlEQVR42mP4%2F58BCv7%2FZwAAHfAD%2FabwPj4AAAAASUVORK5CYII%3D); border-left: solid 1em black; border-right: solid 1em red; } /* should paint in the middle layer because it is a float */
+   #eyes-c { display: block; background: red; border-left: 2em solid yellow; width: 10em; height: 2em; } /* should paint bottom most because it is a block */
+
+   /* lines six to nine, with nose: auto margins */
+   .nose { float: left; margin: -2em 2em -1em; border: solid 1em black; border-top: 0; min-height: 80%; height: 60%; max-height: 3em; /* percentages become auto (see 10.5 and 10.7) and intrinsic height is more than 3em, so 3em wins */ padding: 0; width: 12em; }
+   .nose > div { padding: 1em 1em 3em; height: 0; background: yellow; }
+   .nose div div { width: 2em; height: 2em; background: red; margin: auto; }
+   .nose :hover div { border-color: blue; }
+   .nose div:hover :before { border-bottom-color: inherit; }
+   .nose div:hover :after { border-top-color: inherit; }
+   .nose div div:before { display: block; border-style: none solid solid; border-color: red yellow black yellow; border-width: 1em; content: ''; height: 0; }
+   .nose div    :after { display: block; border-style: solid solid none; border-color: black yellow red yellow; border-width: 1em; content: ''; height: 0; }
+
+   /* between lines nine and ten: margin collapsing with 'float' and 'clear' */
+   .empty { margin: 6.25em; height: 10%; /* computes to auto which makes it empty per 8.3.1:7 (own margins) */ }
+   .empty div { margin: 0 2em -6em 4em; }
+   .smile { margin: 5em 3em; clear: both; /* clearance is negative (see 8.3.1 and 9.5.1) */ }
+
+   /* line ten and eleven: containing block for abs pos */
+   .smile div { margin-top: 0.25em; background: black; width: 12em; height: 2em; position: relative; bottom: -1em; }
+   .smile div div { position: absolute; top: 0; right: 1em; width: auto; height: 0; margin: 0; border: yellow solid 1em; }
+
+   /* smile (over lines ten and eleven): backgrounds behind borders, inheritance of 'float', nested floats, negative heights */
+   .smile div div span { display: inline; margin: -1em 0 0 0; border: solid 1em transparent; border-style: none solid; float: right; background: black; height: 1em; }
+   .smile div div span em { float: inherit; border-top: solid yellow 1em; border-bottom: solid black 1em; } /* zero-height block; width comes from (zero-height) child. */
+   .smile div div span em strong { width: 6em; display: block; margin-bottom: -1em; /* should have no effect, since parent has top&bottom borders, so this margin doesn't collapse */ }
+
+   /* line twelve: line-height */
+   .chin { margin: -4em 4em 0; width: 8em; line-height: 1em; border-left: solid 1em black; border-right: solid 1em black; background: yellow url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAFSDNYfAAAAaklEQVR42u3XQQrAIAwAQeP%2F%2F6wf8CJBJTK9lnQ7FpHGaOurt1I34nfH9pMMZAZ8BwMGEvvh%2BBsJCAgICLwIOA8EBAQEBAQEBAQEBK79H5RfIQAAAAAAAAAAAAAAAAAAAAAAAAAAAID%2FABMSqAfj%2FsLmvAAAAABJRU5ErkJggg%3D%3D) /* 64x64 red square */ no-repeat fixed /* shouldn't be visible unless the smiley is moved to the top left of the viewport */; }
+   .chin div { display: inline; font: 2px/4px serif; }
+
+   /* line thirteen: cascade and selector tests */
+   .parser-container div { color: maroon; border: solid; color: orange; } /* setup */
+   div.parser-container * { border-color: black; /* overrides (implied) border-color on previous line */ } /* setup */
+   * div.parser { border-width: 0 2em; /* overrides (implied) declarations on earlier line */ } /* setup */
+
+   /* line thirteen continued: parser tests */
+   .parser { /* comment parsing test -- comment ends before the end of this line, the backslash should have no effect: \*/ }
+   .parser { margin: 0 5em 1em; padding: 0 1em; width: 2em; height: 1em; error: \}; background: yellow; } /* setup with parsing test */
+   * html .parser {  background: gray; }
+   \.parser { padding: 2em; }
+   .parser { m\argin: 2em; };
+   .parser { height: 3em; }
+   .parser { width: 200; }
+   .parser { border: 5em solid red ! error; }
+   .parser { background: red pink; }
+
+   /* line fourteen (last line of face): table */
+   ul { display: table; padding: 0; margin: -1em 7em 0; background: red; }
+   ul li { padding: 0; margin: 0; }
+   ul li.first-part { display: table-cell; height: 1em; width: 1em; background: black; }
+   ul li.second-part { display: table; height: 1em; width: 1em; background: black; } /* anonymous table cell wraps around this */
+   ul li.third-part { display: table-cell; height: 0.5em; /* gets stretched to fit row */ width: 1em; background: black; }
+   ul li.fourth-part { list-style: none; height: 1em; width: 1em; background: black; } /* anonymous table cell wraps around this */
+
+   /* bits that shouldn't appear: inline alignment in cells */
+   .image-height-test { height: 10px; overflow: hidden; font: 20em serif; } /* only the area between the top of the line box and the top of the image should be visible */
+   table { margin: 0; border-spacing: 0; }
+   td { padding: 0; }
+
+  </style>
+  <link rel="appendix stylesheet" href="data:text/css,.picture%20%7B%20background%3A%20none%3B%20%7D"> <!-- this stylesheet should be applied by default -->
+ </head>
+ <body>
+  <div class="intro">
+   <h1>Standards compliant?</h1>
+   <p><a href="#top">Take The Acid2 Test</a> and compare it to <a
+   href="reference.html">the reference rendering</a>.</p>
+  </div>
+  <h2 id="top">Hello World!</h2>
+  <div class="picture">
+   <p><table><tr><td></table><p class="bad"> <!-- <table> closes <p> per the HTML4 DTD -->
+   <blockquote class="first one"><address class="second two"></address></blockquote>
+   <div class="forehead"><div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div></div>
+   <div class="eyes"><div id="eyes-a"><object data="data:application/x-unknown,ERROR"><object data="404.html?pipe=status(404)" type="text/html"><object data="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAAYCAYAAAFy7sgCAAAGsUlEQVRo3u2ZbWwcZxHHf3s%2B7LNbO3ZjXBtowprGODRX0qpNQCjmJKuVKhMl1P2AkCwhFOIKkCBSm9IXavGFKAixIAECwkmWo5MrhRI3Ub40IEwQgp6aIDg3Cd6eEqyIHEteah%2B1E69vhw%2BZtTaX8704ZzkKjHS6271nZ56ZZ%2BY%2F%2F%2BdZKF%2FCwYshx3EkkggLsD1v4FQkEZZYLCbAKyG9%2Ba9EIsG6hnUAf8x74K3aUC3j4%2BM54HcsR2oAIomwZOezkv%2FnSHpYNh%2BNCmAE7xv94zvFdd1bHsjMZmQkPSxAJP%2B%2FfuBLwK54PC7JZFKAVJmzXLBt2w%2FMvcDLwIb8QS8CeJ4nkURYIomw7J%2FYJ8BvSiiXptGGxWds2%2Fa9%2Bnaxh%2BYAD%2Bgt04NDgABTpQY2cvvSFLzw86gWeBVwC8SzlOSv2YeBPfmDBoBHgKmR9LBEEmHZfDTqGykqfkUE0nA78BzQGfSgUeP3wNeTXwXg7MwZDhw4UHL6ra2ti79%2FOvljgG8AZ4H64Lhm4MvAocxsRppGG%2FxcXihlwLIs6R%2FfKV2HO%2F26uA94pdDYUKUZUU7W1RQYXA98Gnhaf5%2FXWX0HeAHYoQonqa4sZSOsSWMCWeC9Yko%2BCQwBe4E6oNc0Tc91XTl1%2BaTsn9gnI%2Blhyc5nZWxsrBIkKSbl2tiic3tW53YDEwOKaoFBrcOfqKee53lG9xsPMjV784r%2F4lO%2FpPvyJ9iyZcuvFSaXK5XYeAZ4CDgGvB3MS4B54LQuWYPeuy4iRFsevsXqpuYoqVQKIH2bK1CuDQNo11o4XUzh%2FcDWYIe1LEtyuZx4niee54njOGKapgfsqlL%2Bl2OjEXg8nxrc1dJ0h3hbtL%2BGCtz7KPBF4CuBe9uB15VafE8hr9qylI3HgG8C2%2FK7VyHZoJj7MrBRm30qFotJMpkU27YlHo%2F7Ha5a%2BV%2FKRkSJ4KuKRLVLKapTjB1SzAVIjY2NSXY%2BKyPpYdk%2FsU9OXT4pruv6BdZbBQfKsVGnvWlIe1VB6VQO8JxC1vZYLCbZ%2BaxsPhpdZDyRRFhG0sPiOE6ldKBg2lRg4xF1YCDIIIKN7DGgD3gH%2BBXwejKZfPrs2tPs%2FvPN2bKuYR1nd7xLKBSSJeqoXKnERjPwNWAG%2BLn2rZuM%2B4Tpml6vaWlp4eLcxVusZq5lCgVgOVKJjRqdX86ffL4D5wIoZACnTpw4wRMdT96i%2FImOJxERAs4uVyqxUacF%2FPdiCj%2BjdRBRGFtwXVdG0sPSdbhTmkYbpH98p2RmM2JZlig1vl0GWo4NQ%2Fn%2Bs5pKRXfwjweaxy7TND3HcRZbfC6X8xVPVQlGy7WxVWlO5XRXFXm6EZmrQuSXYyPE3SiVoEhE6Wyr0u2rumO6zv%2B21AFdQAswC1wCMuUCXCmyWQus103Qg8qlDO0lxwOb%2Fl4FiK3AB3VS%2FuKKLtK%2FgbeAnwG%2FvUODuRw%2FFrR0H1UC75fwu8oJ%2FhFsW5VIG%2FBUgEIN6Y65O4AHu4Ap0zQ9y7LEcZyb9lRBUHQcRyzL8unZVBW5bFWAvAp%2BhDQ2g4F47dUYtlU6obXA54DnVdFLekjUGGifh4AFy7LEdV3xj3X9I66m0QZpGm2QrsOd0j%2B%2BU0bSw5KZzYjrun6HWlAd961i4FfCj0aN1Usau%2Bc1lmuXPFwvAEumUut7tQQvAb%2FXb%2FT0bCAej9cODg7yt%2Bm%2F8q2%2F7OUHZ76PnZ1k2p0mJzlykmPancbOTnL0whHs7CQfb%2B5mx2d3sH79%2BtCRI0c6FeaOr9ICrIQfLvA%2B8BGNXxi4R6HrisJVUWrxAVW2oMFf0Aczim8o3kV6enowDIPjF9%2Fk%2BMU3S3rrjzMMg56eHr%2BxP7qKFbASfojG6kpeDGs1tiW53RxwWT%2Bin5q8w4xpQK5evQpAR30H7ZH2khNvj7TTUd8BgD4rqmu1ZKX8qNeY%2BfHz4zlXDgT5E8tpCTUq7XSBC4Euv8227TV9fX1E73%2BYtvo27BmbS9cvFVTY3bSRFza9yOcf6Gfmygy7d%2B%2Fm%2FPnzF4DvrsBLhnJlJfwIKXxv1PheAE4qK6p4H9AGbNKTuhngBPBPXYRe4IemaT5kWZbR19fHNbmGnZ1k4r3U4glDR30Hm5qjbGjsImJEOHbsGHv27JFz5869o0eFq01Jq%2BmHAXwI6FFKagMTgHM7GzFDS%2BoeLSMv7zjzC9x4Y7gxFovVDAwMEI1GaWlpWSzRVCrFwYMH%2FXfxZ4AfAa8B%2F7lDaGg1%2FQgp43lfK0yqtRMuJa3ceKe5DfgYsCYAZ2ngD8CfAkzqTpW7xY%2F%2FSznyX%2FVeUb2kVmX4AAAAAElFTkSuQmCC">ERROR</object></object></object></div><div id="eyes-b"></div><div id="eyes-c"></div></div> <!-- that's a PNG with 8bit alpha containing two eyes -->
+   <div class="nose"><div><div></div></div></div>
+   <div class="empty"><div></div></div>
+   <div class="smile"><div><div><span><em><strong></strong></em></span></div></div></div>
+   <div class="chin"><div>&nbsp;</div></div>
+   <div class="parser-container"><div class="parser"><!-- ->ERROR<!- --></div></div> <!-- two dashes is what delimits a comment, so the text "->ERROR<!-" earlier on this line is actually part of a comment -->
+   <ul>
+    <li class="first-part"></li>
+    <li class="second-part"></li>
+    <li class="third-part"></li>
+    <li class="fourth-part"></li>
+   </ul>
+   <div class="image-height-test"><table><tr><td><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAFSDNYfAAAAaklEQVR42u3XQQrAIAwAQeP%2F%2F6wf8CJBJTK9lnQ7FpHGaOurt1I34nfH9pMMZAZ8BwMGEvvh%2BBsJCAgICLwIOA8EBAQEBAQEBAQEBK79H5RfIQAAAAAAAAAAAAAAAAAAAAAAAAAAAID%2FABMSqAfj%2FsLmvAAAAABJRU5ErkJggg%3D%3D" alt=""></td></tr></table></div>
+  </div>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.css b/tests/wpt/web-platform-tests/acid/acid3/empty.css
new file mode 100755
index 0000000000000..d490c124219f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/empty.css
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML><html><head><title>FAIL</title><style>
+<!-- this file is sent as text/html, not text/css, which is why it is
+     called "empty.css" despite the following lines -->
+
+  body { background: white; color: black; }
+  h1 { color: red; }
+
+</style><body><h1>FAIL</h1></body></html>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.css.headers b/tests/wpt/web-platform-tests/acid/acid3/empty.css.headers
new file mode 100644
index 0000000000000..156209f9c81ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/empty.css.headers
@@ -0,0 +1 @@
+Content-Type: text/html
diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.html b/tests/wpt/web-platform-tests/acid/acid3/empty.html
new file mode 100755
index 0000000000000..0b91841acfcbf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/empty.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html><head><title></title></head><body></body></html>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.png b/tests/wpt/web-platform-tests/acid/acid3/empty.png
new file mode 100755
index 0000000000000000000000000000000000000000..fd5b91ea07b947391714085ea9c763d3a7868d68
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^j3CSbBp9sfW`_bPrjj7PV1@&4zw>v1cuC&wE({E-
zdX<fUJkA1-$YLPv0mg18v+aP4mJ-*9l91Hm5(XPZ7k}rF$N*P`jFQ|OI~ypOnwVl|
zQ<7PdlWOPY=;>pl4`JKrXMkmr@>449Yzm-q1$H*Y$wiq3C3XdgMX7ludU^RJnQ4_8
zN~yU8C6#&wdFe`;Hu_K{Hu@0F`e2*7e#HI*x`)ft#W95Ada?zOeTd=Uj|=|7Ko*0i
LtDnm{r-UW|%f3qN

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.txt b/tests/wpt/web-platform-tests/acid/acid3/empty.txt
new file mode 100755
index 0000000000000..452a7e6d753d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/empty.txt
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><title>FAIL</title></head><body><p>FAIL</p><script>parent.notify("empty.txt")</script></body></html>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.xml b/tests/wpt/web-platform-tests/acid/acid3/empty.xml
new file mode 100755
index 0000000000000..e6a125cc0d575
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/empty.xml
@@ -0,0 +1,4 @@
+<root>
+ <fail> This is an invalid byte in UTF-8: � </fail>
+ <test/> <!-- shouldn't ever be parsed, as the parser should abort at the first sign of non-well-formedness -->
+</root>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.xml.headers b/tests/wpt/web-platform-tests/acid/acid3/empty.xml.headers
new file mode 100644
index 0000000000000..9395ed9a2857b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/empty.xml.headers
@@ -0,0 +1 @@
+Content-Type: application/xml;charset=utf-8
diff --git a/tests/wpt/web-platform-tests/acid/acid3/favicon.ico b/tests/wpt/web-platform-tests/acid/acid3/favicon.ico
new file mode 100755
index 0000000000000..e69de29bb2d1d
diff --git a/tests/wpt/web-platform-tests/acid/acid3/favicon.ico.headers b/tests/wpt/web-platform-tests/acid/acid3/favicon.ico.headers
new file mode 100644
index 0000000000000..afa04c171df25
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/favicon.ico.headers
@@ -0,0 +1 @@
+Content-Type: image/x-icon
diff --git a/tests/wpt/web-platform-tests/acid/acid3/reference.png b/tests/wpt/web-platform-tests/acid/acid3/reference.png
new file mode 100755
index 0000000000000000000000000000000000000000..22cd4cae0837ad174b0d08070ce7fa01d9d3a748
GIT binary patch
literal 1771
zcmeAS@N?(olHy`uVBq!ia0y~yV4BImz<7*<2`IARFZ(VA2DVL}E{-7;x8B}$^gC=I
z;1I}v>R?TOoZ9q<a{Ff94CCnX5VoGYXS<WfU7v|{uTJ@FxyHpX;aa;OL&G#?hA2LU
z3`-DN@D#>}2toJ=B_C3LzUR(byNr!Nc<Z%$S(TbgzvuNa7`VFB{O&a_V>sb^no(i<
zQ4R)$>CfMv&R%Obo!KD|XcF8og!#nTM}(7rMq)P=;cA>pKn{bu4X7TWWyo6mQ^$>=
zKvgi2WA@j3TV)!4UfU#fXzjCSJ+cf%mx~xK6froQW@ON12ca!8P(D-$!UrmO(DTNI
z_1Wg4-&>b>Z@pObpzNSg(|x(po`&mlHj)rVZ_b_zwwSQ>j#z&4w8N}fWzW+k^X+>c
z0G)!<W`s*1N)qzR<`pf-&VRpcru2oPyoamya?jq`c)8#hQoLc0eMHo5Ft_$kKeg}P
zZKiw%-Q{1-Z{b(se=m1H(;^uu6c7Oev>5I@L_pn${xx^`^LWO*ljaOj|H5_7|5@?S
zpGP83ceNrgsbt#Uv*6w%e}6hg=p68Pw}ess;eA73(#qT^#QPqb)0KBlW@9hTmby@M
z;`G+c1cvlCNJ$!!J`E;WXUb^bS;uyv=u^>dDV%C1A3e;&aN*OInEh-IYR}zZ#0bzO
z+IKuRD@Zfw`kxWaWym`xX^qJDh~!UPjv*BC5P2M?V$XM@7Gp1YNDXT2rU0V?M{EGq
z!?h5h1d+SY;}~Mf0iM%s*Iil;GCEwFw*6Y&A4!H8hu|sgfZ0Rqd<KuV+;Yt>qTWfl
R<-kge!PC{xWt~$(6980{JBa`Q

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/acid/acid3/reference.sub.html b/tests/wpt/web-platform-tests/acid/acid3/reference.sub.html
new file mode 100755
index 0000000000000..310961363bf49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/reference.sub.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+ <title>The Acid3 Test (Reference Rendering)</title>
+ <link rel="icon" href="http://nonexistent-origin.{{host}}">
+ <style type="text/css">
+  html { margin: 0; padding: 0; }
+  body { background: #c0c0c0 url(reference.png) top left no-repeat; margin: 0; padding: 0; }
+  #a { font: bold 100px/120px Arial, sans-serif; position: absolute; top: 57px; left: 57px; color: #000000; z-index: 1; }
+  #a0 { font: bold 100px/120px Arial, sans-serif; position: absolute; top: 60px; left: 60px; color: #C0C0C0; z-index: 0; }
+  #b { position: absolute; top: 230px; left: 625px; width: 0; white-space: pre; }
+  #b div { font: bold 100px/120px Arial, sans-serif; position: absolute; right: 0; text-align: right; color: #000000; }
+  #c { font: 16px/19.2px Arial, sans-serif; color: #808080; width: 562px; position: absolute; top: 350px; left: 57px; }
+  #c a { color: #0000FF; }
+ </style>
+ <body>
+  <div id="a">Acid3</div>
+  <div id="a0">Acid3</div>
+  <div id="b"><div>100/100</div></div>
+  <div id="c">To pass the test,<span></span> a browser must use its default settings, the animation has to be smooth, the score has to end on 100/100, and the final page has to look exactly, pixel for pixel, like <a href="reference.sub.html">this reference rendering</a>.</div>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/support-a.png b/tests/wpt/web-platform-tests/acid/acid3/support-a.png
new file mode 100755
index 0000000000000000000000000000000000000000..9f240083debc76f67f33bc4e15c0318e5e031a35
GIT binary patch
literal 2312
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

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/acid/acid3/support-b.png b/tests/wpt/web-platform-tests/acid/acid3/support-b.png
new file mode 100755
index 0000000000000..752ee7ec05c46
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/support-b.png
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><title>FAIL</title><style> * { background: transparent; } </style></head><body><p><!-- this file is transparent --></p></body></html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/acid/acid3/support-b.png.headers b/tests/wpt/web-platform-tests/acid/acid3/support-b.png.headers
new file mode 100644
index 0000000000000..844a971169c4b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/support-b.png.headers
@@ -0,0 +1,2 @@
+Content-Type: text/html
+
diff --git a/tests/wpt/web-platform-tests/acid/acid3/svg.xml b/tests/wpt/web-platform-tests/acid/acid3/svg.xml
new file mode 100755
index 0000000000000..f5b1ffad147de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/svg.xml
@@ -0,0 +1 @@
+<?xml-stylesheet href="data:text/css,text%7Bfont-family%3AACID3svgfont%7D"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100" height="100"><defs><font-face font-family="ACID3svgfont"><font-face-src><font-face-uri xlink:href="font.svg#mini"/></font-face-src></font-face><path id="path" d="M0 0l0 42l16 16l4711 0"/></defs><text>X</text></svg>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/svg.xml.headers b/tests/wpt/web-platform-tests/acid/acid3/svg.xml.headers
new file mode 100644
index 0000000000000..070de35fbe965
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/svg.xml.headers
@@ -0,0 +1 @@
+Content-Type: image/svg+xml
diff --git a/tests/wpt/web-platform-tests/acid/acid3/test.html b/tests/wpt/web-platform-tests/acid/acid3/test.html
new file mode 100644
index 0000000000000..d2f08405af53a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/test.html
@@ -0,0 +1,3510 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html class="reftest-wait">
+ <title>The Acid3 Test</title>
+ <link rel="match" href="reference.sub.html">
+ <script type="text/javascript">
+  var startTime = new Date();
+ </script>
+ <style type="text/css">
+
+  /* set some basic styles so that we can get reliably exact results */
+  * { margin: 0; border: 1px blue; padding: 0; border-spacing: 0; font: inherit; line-height: 1.2; color: inherit; background: transparent; }
+  :link, :visited { color: blue; }
+
+  /* header and general layout */
+  html { font: 20px Arial, sans-serif; border: 2cm solid gray; width: 32em; margin: 1em; }
+  :root { background: silver; color: black; border-width: 0 0.2em 0.2em 0; } /* left and top content edges: 1*20px = 20px */
+  body { padding: 2em 2em 0; background: url(data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAABGdBTUEAAK%2FINwWK6QAAAAlwSFlzAAAASAAAAEgARslrPgAAABtJREFUOMtj%2FM9APmCiQO%2Bo5lHNo5pHNVNBMwAinAEnIWw89gAAACJ6VFh0U29mdHdhcmUAAHjac0zJT0pV8MxNTE8NSk1MqQQAL5wF1K4MqU0AAAAASUVORK5CYII%3D) no-repeat 99.8392283% 1px white; border: solid 1px black; margin: -0.2em 0 0 -0.2em; } /* left and top content edges: 20px-0.2*20px+1px+2*20px = 57px */
+  h1:first-child { cursor: help; font-size: 5em; font-weight: bolder; margin-bottom: -0.4em; text-shadow: rgba(192, 192, 192, 1.0) 3px 3px; } /* (left:57px, top:57px) */
+  #result { font-weight: bolder; width: 5.68em; text-align: right; }
+  #result { font-size: 5em; margin: -2.19em 0 0; } /* (right:57px+5.2*5*20px = 577px, top:57px+1.2*5*20px-0.4*5*20px+1px+1*40px+1*40px+1px+2*40px+150px-2.19*5*20px = 230px) */
+  .hidden { visibility: hidden; }
+  #slash { color: red; color: hsla(0, 0%, 0%, 1.0); }
+  #instructions { margin-top: 0; font-size: 0.8em; color: gray; color: -acid3-bogus; height: 6.125em; } /* (left:57px, top:230px+1.2*5*20+0 = 350px) */
+  #instructions { margin-right: -20px; padding-right: 20px; background: url(data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAABGdBTUEAAK%2FINwWK6QAAAAlwSFlzAAAASAAAAEgARslrPgAAABtJREFUOMtj%2FM9APmCiQO%2Bo5lHNo5pHNVNBMwAinAEnIWw89gAAACJ6VFh0U29mdHdhcmUAAHjac0zJT0pV8MxNTE8NSk1MqQQAL5wF1K4MqU0AAAAASUVORK5CYII%3D) no-repeat top right; }
+  #instructions span { float: right; width: 20px; margin-right: -20px; background: white; height: 20px; }
+  @font-face { font-family: "AcidAhemTest"; src: url(/fonts/Ahem.ttf); }
+  map::after { position: absolute; top: 18px; left: 638px; content: "X"; background: fuchsia; color: white; font: 20px/1 AcidAhemTest; }
+  iframe { float: left; height: 0; width: 0; } /* hide iframes but don't make them display: none */
+  object { position: fixed; left: 130.5px; top: 84.3px; background: transparent; } /* show objects if they have content */
+  .removed { position: absolute; top: 80px; left: 380px; height: 100px; width: 100px; opacity: 0; }
+
+  /* set the line height of the line of coloured boxes so we can add them without the layout changing height */
+  .buckets { font: 0/0 Arial, sans-serif; }
+  .buckets { padding: 0 0 150px 3px; }
+
+  /* the next two rules give the six coloured blocks their default styles (they match the same elements); the third hides them */
+  :first-child + * .buckets p { display: inline-block; vertical-align: 2em; border: 2em dotted red; padding: 1.0em 0 1.0em 2em; }
+  * + * > * > p { margin: 0; border: 1px solid ! important; }
+  .z { visibility: hidden; } /* only matches the buckets with no score */
+
+  /* sizes for the six buckets */
+  #bucket1 { font-size: 20px; margin-left: 0.2em; padding-left: 1.3em; padding-right: 1.3em; margin-right: 0.0001px; }
+  #bucket2 { font-size: 24px; margin-left: 0.375em; padding-left: 30px; padding-right: 32px; margin-right: 2px; }
+  #bucket3 { font-size: 28px; margin-left: 8.9999px; padding-left: 17px; padding-right: 55px; margin-right: 12px; }
+  #bucket4 { font-size: 32px; margin-left: 0; padding-left: 84px; padding-right: 0; margin-right: 0; }
+  #bucket5 { font-size: 36px; margin-left: 13px; padding-left: 0; padding-right: 94px; margin-right: 25px; }
+  #bucket6 { font-size: 40px; margin-left: -10px; padding-left: 104px; padding-right: -10px; }
+
+  /* colours for them */
+  .z, .zP, .zPP, .zPPP, .zPPPP, .zPPPPP { background: black; }
+  .zPPPPPP, .zPPPPPPP, .zPPPPPPPP, .zPPPPPPPP, .zPPPPPPPPP,
+  .zPPPPPPPPPP { background: grey; }
+  .zPPPPPPPPPPP, .zPPPPPPPPPPPP, .zPPPPPPPPPPPPP,
+  .zPPPPPPPPPPPPPP, .zPPPPPPPPPPPPPPP { background: silver; }
+  #bucket1.zPPPPPPPPPPPPPPPP { background: red; }
+  #bucket2.zPPPPPPPPPPPPPPPP { background: orange; }
+  #bucket3.zPPPPPPPPPPPPPPPP { background: yellow; }
+  #bucket4.zPPPPPPPPPPPPPPPP { background: lime; }
+  #bucket5.zPPPPPPPPPPPPPPPP { background: blue; }
+  #bucket6.zPPPPPPPPPPPPPPPP { background: purple; }
+
+  /* The line-height for the .bucket div is worked out as follows:
+   *
+   * The div.bucket element has a line box with a few
+   * inline-blocks. Each inline-block consists of:
+   *
+   *     2.0em vertical-align from baseline to bottom of inline-block
+   *     1px bottom border
+   *     1.0em bottom padding
+   *     1.0em top padding
+   *     1px top border
+   *
+   * The biggest inline-block has font-size: 40px.
+   *
+   * Thus the distance from the baseline to the top of the biggest
+   * inline-block is (2em+1em+1em)*2em*20px+2px = 162px.
+   *
+   * The line box itself has no other contents, and its strut has zero
+   * height and there is no half-leading, so the height of the
+   * div.bucket is 162px.
+   *
+   * (Why use line-height:0 and font-size:0? Well:
+   *
+   * The div.bucket line box would have a height that is the maximum
+   * of the following two sums:
+   *
+   *  1: half-leading + font descent at 1em + font ascent at 1em + half-leading
+   *  2: half-leading + font descent at 1em + 162px
+   *
+   * Now the half-leading is (line-height - (font-ascent + font-descent))/2, so that is really:
+   *
+   *  1: (line-height - (font-ascent + font-descent))/2 + font descent + font ascent + (line-height - (font-ascent + font-descent))/2
+   *  2: (line-height - (font-ascent + font-descent))/2 + font descent + 162px
+   *
+   * Which simplify to:
+   *
+   *  1: line-height
+   *  2: line-height/2 + (font descent - font-ascent)/2 + 162px
+   *
+   * So if the following expression is true:
+   *
+   *    line-height > line-height/2 + (font descent - font-ascent)/2 + 162px
+   *
+   * That is, if this is true:
+   *
+   *    line-height > font descent - font-ascent + 324px
+   *
+   * ...then the line-height matters, otherwise the font does. Note
+   * that font descent - font-ascent will be in the region of
+   * 10px-30px (with Ahem, exactly 12px). However, if we make the
+   * line-height big, then the _positioning_ of the inline-blocks will
+   * depend on the font descent, since that is what will decide the
+   * distance from the bottom of the line box to the baseline of the
+   * block (since the baseline is set by the strut).
+   *
+   * However, in Acid2 a dependency on the font metrics was introduced
+   * and this caused all kinds of problems. And we can't require Ahem
+   * in the Acid tests, since it's unlikely most people will have it
+   * installed.
+   *
+   * What we want is for the font to not matter, and the baseline to
+   * be as high as possible. We can do that by saying that the font
+   * and the line-height are zero.
+   *
+   * One word of warning. If your browser has a minimum font size feature
+   * that forces font sizes up even when there is no text, you will need
+   * to disable it before running this test.
+   *
+   */
+
+  /* rules specific to the tests below */
+  #instructions:last-child { white-space: pre-wrap; white-space: x-bogus; }
+  /* replaced for http://dbaron.org/mozilla/visited-privacy with the three rules after it:
+     #linktest:link { display: block; color: red; text-align: center; text-decoration: none; }
+     #linktest.pending, #linktest:visited { display: none; } */
+  #linktest { position: absolute; left: 17px; top: 18px; color: red; width: 80px; text-decoration: none; font: 900 small-caps 10px sans-serif; }
+  #linktest:link { color: red; }
+  #linktest.pending, #linktest:visited { color: white; }
+  #\ { color: transparent; color: hsla(0, 0, 0, 1); position: fixed; top: 10px; left: 10px; font: 40px Arial, sans-serif; }
+  #\  #result, #\  #score { position: fixed; top: 10%; left: 10%; width: 4em; z-index: 1; color: yellow; font-size: 50px; background: fuchsia; border: solid 1em purple; }
+ </style>
+
+ <!-- part of the HTTP tests -->
+ <link rel="stylesheet" href="empty.css"><!-- text/html file (should be ignored, <h1> will go red if it isn't) -->
+
+ <!-- the next five script blocks are part of one of the tests -->
+ <script type="text/javascript">
+  var d1 = "fail";
+  var d2 = "fail";
+  var d3 = "fail";
+  var d4 = "fail";
+  var d5 = "fail";
+ </script>
+ <script type="text/javascript" src="data:text/javascript,d1%20%3D%20'one'%3B"></script>
+ <script type="text/javascript" src="data:text/javascript;base64,ZDIgPSAndHdvJzs%3D"></script>
+ <script type="text/javascript" src="data:text/javascript;base64,%5a%44%4d%67%50%53%41%6e%64%47%68%79%5a%57%55%6e%4f%77%3D%3D"></script>
+ <script type="text/javascript" src="data:text/javascript;base64,%20ZD%20Qg%0D%0APS%20An%20Zm91cic%0D%0A%207%20"></script>
+ <script type="text/javascript" src="data:text/javascript,d5%20%3D%20'five%5Cu0027s'%3B"></script>
+
+ <!-- part of the JS regexp and \0 value tests test -->
+ <script type="text/javascript">
+  var nullInRegexpArgumentResult = 0 < /script/.test('\0script') ? "passed" : "failed";
+ </script>
+
+ <!-- main test body -->
+ <script type="text/javascript">
+  var notifications = {};
+  function notify(file) {
+    // used in cross-file tests
+    notifications[file] = 1;
+  }
+  function fail(message) {
+    throw { message: message };
+  }
+  function assert(condition, message) {
+    if (!condition)
+      fail(message);
+  }
+  function assertEquals(expression, value, message) {
+    if (expression != value) {
+      expression = (""+expression).replace(/[\r\n]+/g, "\\n");
+      value = (""+value).replace(/\r?\n/g, "\\n");
+      fail("expected '" + value + "' but got '" + expression + "' - " + message);
+    }
+  }
+  function getTestDocument() {
+    var iframe = document.getElementById("selectors");
+    var doc = iframe.contentDocument;
+    for (var i = doc.documentElement.childNodes.length-1; i >= 0; i -= 1)
+      doc.documentElement.removeChild(doc.documentElement.childNodes[i]);
+    doc.documentElement.appendChild(doc.createElement('head'));
+    doc.documentElement.firstChild.appendChild(doc.createElement('title'));
+    doc.documentElement.appendChild(doc.createElement('body'));
+    return doc;
+  }
+  function selectorTest(tester) {
+    var doc = getTestDocument();
+    var style = doc.createElement('style');
+    style.appendChild(doc.createTextNode("* { z-index: 0; position: absolute; }\n"));
+    doc.documentElement.firstChild.appendChild(style);
+    var ruleCount = 0;
+    tester(doc, function (selector) {
+        ruleCount += 1;
+        style.appendChild(doc.createTextNode(selector + " { z-index: " + ruleCount + "; }\n"));
+        return ruleCount;
+      }, function(node, rule, message) {
+        var value = doc.defaultView.getComputedStyle(node, "").zIndex;
+        assert(value != 'auto', "underlying problems prevent this test from running properly");
+        assertEquals(value, rule, message);
+    });
+  }
+  var kungFuDeathGrip = null; // used to hold things from test to test
+  var tests = [
+
+    // there are 6 buckets with 16 tests each, plus four special tests (0, 97, 98, and 99).
+
+    // Remove the "JS required" message and the <script> element in the <body>
+    function () {
+      // test 0: whether removing an element that is the last child correctly recomputes styles for the new last child
+      // also tests support for getComputedStyle, :last-child, pre-wrap, removing a <script> element
+      // removing script:
+      var scripts = document.getElementsByTagName('script');
+      document.body.removeChild(scripts[scripts.length-1]);
+      // removing last child:
+      var last = document.getElementById('remove-last-child-test');
+      var penultimate = last.previousSibling; // this should be the whitespace node
+      penultimate = penultimate.previousSibling; // this should now be the actual penultimate element
+      last.parentNode.removeChild(last);
+      assertEquals(document.defaultView.getComputedStyle(penultimate, '').whiteSpace, 'pre-wrap', "found unexpected computed style");
+      return 7;
+    },
+
+    // bucket 1: DOM Traversal, DOM Range, HTTP
+    // DOM Traversal
+    function () {
+      // test 1: NodeFilters and Exceptions
+      var doc = getTestDocument(); // looks like <!DOCTYPE><html><head><title/><\head><body/><\html>     (the '\'s are to avoid validation errors)
+      var iteration = 0;
+      var exception = "Roses";
+      var test = function(node) {
+        iteration += 1;
+        switch (iteration) {
+          case 1: case 3: case 4: case 6: case 7: case 8: case 9: case 14: case 15: throw exception;
+          case 2: case 5: case 10: case 11: case 12: case 13: return true; // ToNumber(true) => 1
+          default: throw 0;
+        };
+      };
+      var check = function(o, method) {
+        var ok = false;
+        try {
+          o[method]();
+        } catch (e) {
+          if (e === exception)
+            ok = true;
+        }
+        assert(ok, "method " + o + "." + method + "() didn't forward exception");
+      };
+      var i = doc.createNodeIterator(doc.documentElement, 0xFFFFFFFF, test, true);
+      check(i, "nextNode"); // 1
+      assertEquals(i.nextNode(), doc.documentElement, "i.nextNode() didn't return the right node"); // 2
+      check(i, "previousNode"); // 3
+      var w = document.createTreeWalker(doc.documentElement, 0xFFFFFFFF, test, true);
+      check(w, "nextNode"); // 4
+      assertEquals(w.nextNode(), doc.documentElement.firstChild, "w.nextNode() didn't return the right node"); // 5
+      check(w, "previousNode"); // 6
+      check(w, "firstChild"); // 7
+      check(w, "lastChild"); // 8
+      check(w, "nextSibling"); // 9
+      assertEquals(iteration, 9, "iterations went wrong");
+      assertEquals(w.previousSibling(), null, "w.previousSibling() didn't return the right node"); // doesn't call filter
+      assertEquals(iteration, 9, "filter called incorrectly for previousSibling()");
+      assertEquals(w.lastChild(), doc.getElementsByTagName('title')[0], "w.lastChild() didn't return the right node"); // 10
+      assertEquals(w.nextSibling(), null, "w.nextSibling() didn't return the right node"); // 11 (filter called on parent, to see if it's included, otherwise it could skip that and find a nextsibling elsewhere)
+      assertEquals(iteration, 11, "filter called incorrectly for nextSibling()");
+      assertEquals(w.parentNode(), doc.documentElement.firstChild, "w.parentNode() didn't return the right node"); // 12
+      assertEquals(w.nextSibling(), doc.documentElement.lastChild, "w.nextSibling() didn't return the right node"); // 13
+      check(w, "previousSibling"); // 14
+      check(w, "parentNode"); // 15
+      return 1;
+    },
+    function () {
+      // test 2: Removing nodes during iteration
+      var count = 0;
+      var expect = function(n, node1, node2) {
+        count += 1;
+        assert(n == count, "reached expectation " + n + " when expecting expectation " + count);
+        assertEquals(node1, node2, "expectation " + count + " failed");
+      };
+      var doc = getTestDocument();
+      var t1 = doc.body.appendChild(doc.createElement('t1'));
+      var t2 = doc.body.appendChild(doc.createElement('t2'));
+      var t3 = doc.body.appendChild(doc.createElement('t3'));
+      var t4 = doc.body.appendChild(doc.createElement('t4'));
+      var callCount = 0;
+      var filterFunctions = [
+        function (node) { expect(1, node, doc.body); return true; }, // filter 0
+        function (node) { expect(3, node, t1); return true; }, // filter 1
+        function (node) { expect(5, node, t2); return true; }, // filter 2
+        function (node) { expect(7, node, t3); doc.body.removeChild(t4); return true; }, // filter 3
+        function (node) { expect(9, node, t4); return true; }, // filter 4
+        function (node) { expect(11, node, t4); doc.body.removeChild(t4); return 2 /* REJECT */; }, // filter 5
+        function (node) { expect(12, node, t3); return true; }, // filter 6
+        function (node) { expect(14, node, t2); doc.body.removeChild(t2); return true; }, // filter 7
+        function (node) { expect(16, node, t1); return true; }, // filter 8
+      ];
+      var i = doc.createNodeIterator(doc.documentElement.lastChild, 0xFFFFFFFF, function (node) { return filterFunctions[callCount++](node); }, true);
+      // * B 1 2 3 4
+      expect(2, i.nextNode(), doc.body); // filter 0
+      // [B] * 1 2 3 4
+      expect(4, i.nextNode(), t1); // filter 1
+      // B [1] * 2 3 4
+      expect(6, i.nextNode(), t2); // filter 2
+      // B 1 [2] * 3 4
+      expect(8, i.nextNode(), t3); // filter 3
+      // B 1 2 [3] *
+      doc.body.appendChild(t4);
+      // B 1 2 [3] * 4
+      expect(10, i.nextNode(), t4); // filter 4
+      // B 1 2 3 [4] *
+      expect(13, i.previousNode(), t3); // filters 5, 6
+        // B 1 2 3 * (4) // filter 5
+        // B 1 2 [3] *   // between 5 and 6
+        // B 1 2 * (3)   // filter 6
+      // B 1 2 * [3]
+      expect(15, i.previousNode(), t2); // filter 7
+        // B 1 * (2) [3]
+        // -- spec says "For instance, if a NodeFilter removes a node
+        //    from a document, it can still accept the node, which
+        //    means that the node may be returned by the NodeIterator
+        //    or TreeWalker even though it is no longer in the subtree
+        //    being traversed."
+        // -- but it also says "If changes to the iterated list do not
+        //    remove the reference node, they do not affect the state
+        //    of the NodeIterator."
+      // B 1 * [3]
+      expect(17, i.previousNode(), t1); // filter 8
+      // B [1] * 3
+      return 1;
+    },
+    function () {
+      // test 3: the infinite iterator
+      var doc = getTestDocument();
+      for (var i = 0; i < 5; i += 1) {
+        doc.body.appendChild(doc.createElement('section'));
+        doc.body.lastChild.title = i;
+      }
+      var count = 0;
+      var test = function() {
+        if (count > 3 && count < 12)
+          doc.body.appendChild(doc.body.firstChild);
+        count += 1;
+        return (count % 2 == 0) ? 1 : 2;
+      };
+      var i = doc.createNodeIterator(doc.body, 0xFFFFFFFF, test, true);
+      assertEquals(i.nextNode().title, "0", "failure 1");
+      assertEquals(i.nextNode().title, "2", "failure 2");
+      assertEquals(i.nextNode().title, "4", "failure 3");
+      assertEquals(i.nextNode().title, "1", "failure 4");
+      assertEquals(i.nextNode().title, "3", "failure 5");
+      assertEquals(i.nextNode().title, "0", "failure 6");
+      assertEquals(i.nextNode().title, "2", "failure 7");
+      assertEquals(i.nextNode(), null, "failure 8");
+      return 1;
+    },
+    function () {
+      // test 4: ignoring whitespace text nodes with node iterators
+      var count = 0;
+      var expect = function(node1, node2) {
+        count += 1;
+        assertEquals(node1, node2, "expectation " + count + " failed");
+      };
+      var allButWS = function (node) {
+        if (node.nodeType == 3 && node.data.match(/^\s*$/))
+          return 2;
+        return 1;
+      };
+      var i = document.createNodeIterator(document.body, 0x01 | 0x04 | 0x08 | 0x10 | 0x20, allButWS, true);
+      // now walk the document body and make sure everything is in the right place
+      expect(i.nextNode(), document.body); // 1
+      expect(i.nextNode(), document.getElementsByTagName('h1')[0]);
+      expect(i.nextNode(), document.getElementsByTagName('h1')[0].firstChild);
+      expect(i.nextNode(), document.getElementsByTagName('div')[0]);
+      expect(i.nextNode(), document.getElementById('bucket1'));
+      expect(i.nextNode(), document.getElementById('bucket2'));
+      expect(i.nextNode(), document.getElementById('bucket3'));
+      expect(i.nextNode(), document.getElementById('bucket4'));
+      expect(i.nextNode(), document.getElementById('bucket5'));
+      expect(i.nextNode(), document.getElementById('bucket6')); // 10
+      expect(i.nextNode(), document.getElementById('result'));
+      expect(i.nextNode(), document.getElementById('score'));
+      expect(i.nextNode(), document.getElementById('score').firstChild);
+      expect(i.nextNode(), document.getElementById('slash'));
+      expect(i.nextNode(), document.getElementById('slash').firstChild);
+      expect(i.nextNode(), document.getElementById('slash').nextSibling);
+      expect(i.nextNode(), document.getElementById('slash').nextSibling.firstChild);
+      expect(i.nextNode(), document.getElementsByTagName('map')[0]);
+      expect(i.nextNode(), document.getElementsByTagName('area')[0]);
+      expect(i.nextNode(), document.getElementsByTagName('iframe')[0]); // 20
+      expect(i.nextNode(), document.getElementsByTagName('iframe')[0].firstChild);
+      expect(i.nextNode(), document.getElementsByTagName('iframe')[1]);
+      expect(i.nextNode(), document.getElementsByTagName('iframe')[1].firstChild);
+      expect(i.nextNode(), document.getElementsByTagName('iframe')[2]);
+      expect(i.nextNode(), document.forms[0]);
+      expect(i.nextNode(), document.forms.form.elements[0]);
+      expect(i.nextNode(), document.getElementsByTagName('table')[0]);
+      expect(i.nextNode(), document.getElementsByTagName('tbody')[0]);
+      expect(i.nextNode(), document.getElementsByTagName('tr')[0]);
+      expect(i.nextNode(), document.getElementsByTagName('td')[0]);
+      expect(i.nextNode(), document.getElementsByTagName('td')[0].getElementsByTagName('p')[0]);
+      expect(i.nextNode(), document.getElementById('instructions'));
+      expect(i.nextNode(), document.getElementById('instructions').firstChild);
+      expect(i.nextNode().nodeName, "SPAN");
+      expect(i.nextNode().nodeName, "#text");
+      expect(i.nextNode(), document.links[1]);
+      expect(i.nextNode(), document.links[1].firstChild);
+      expect(i.nextNode(), document.getElementById('instructions').lastChild);
+      expect(i.nextNode(), null);
+      // walk it backwards for good measure
+      expect(i.previousNode(), document.getElementById('instructions').lastChild);
+      expect(i.previousNode(), document.links[1].firstChild);
+      expect(i.previousNode(), document.links[1]);
+      expect(i.previousNode().nodeName, "#text");
+      expect(i.previousNode().nodeName, "SPAN");
+      expect(i.previousNode(), document.getElementById('instructions').firstChild);
+      expect(i.previousNode(), document.getElementById('instructions'));
+      expect(i.previousNode(), document.getElementsByTagName('td')[0].getElementsByTagName('p')[0]);
+      expect(i.previousNode(), document.getElementsByTagName('td')[0]);
+      expect(i.previousNode(), document.getElementsByTagName('tr')[0]);
+      expect(i.previousNode(), document.getElementsByTagName('tbody')[0]);
+      expect(i.previousNode(), document.getElementsByTagName('table')[0]);
+      expect(i.previousNode(), document.forms.form.elements[0]);
+      expect(i.previousNode(), document.forms[0]);
+      expect(i.previousNode(), document.getElementsByTagName('iframe')[2]);
+      expect(i.previousNode(), document.getElementsByTagName('iframe')[1].firstChild);
+      expect(i.previousNode(), document.getElementsByTagName('iframe')[1]);
+      expect(i.previousNode(), document.getElementsByTagName('iframe')[0].firstChild);
+      expect(i.previousNode(), document.getElementsByTagName('iframe')[0]); // 20
+      expect(i.previousNode(), document.getElementsByTagName('area')[0]);
+      expect(i.previousNode(), document.getElementsByTagName('map')[0]);
+      expect(i.previousNode(), document.getElementById('slash').nextSibling.firstChild);
+      expect(i.previousNode(), document.getElementById('slash').nextSibling);
+      expect(i.previousNode(), document.getElementById('slash').firstChild);
+      expect(i.previousNode(), document.getElementById('slash'));
+      expect(i.previousNode(), document.getElementById('score').firstChild);
+      expect(i.previousNode(), document.getElementById('score'));
+      expect(i.previousNode(), document.getElementById('result'));
+      expect(i.previousNode(), document.getElementById('bucket6'));
+      expect(i.previousNode(), document.getElementById('bucket5'));
+      expect(i.previousNode(), document.getElementById('bucket4'));
+      expect(i.previousNode(), document.getElementById('bucket3'));
+      expect(i.previousNode(), document.getElementById('bucket2'));
+      expect(i.previousNode(), document.getElementById('bucket1'));
+      expect(i.previousNode(), document.getElementsByTagName('div')[0]);
+      expect(i.previousNode(), document.getElementsByTagName('h1')[0].firstChild);
+      expect(i.previousNode(), document.getElementsByTagName('h1')[0]);
+      expect(i.previousNode(), document.body);
+      expect(i.previousNode(), null);
+      return 1;
+    },
+    function () {
+      // test 5: ignoring whitespace text nodes with tree walkers
+      var count = 0;
+      var expect = function(node1, node2) {
+        count += 1;
+        assertEquals(node1, node2, "expectation " + count + " failed");
+      };
+      var allButWS = function (node) {
+        if (node.nodeType == 3 && node.data.match(/^\s*$/))
+          return 3;
+        return 1;
+      };
+      var w = document.createTreeWalker(document.body, 0x01 | 0x04 | 0x08 | 0x10 | 0x20, allButWS, true);
+      expect(w.currentNode, document.body);
+      expect(w.parentNode(), null);
+      expect(w.currentNode, document.body);
+      expect(w.firstChild(), document.getElementsByTagName('h1')[0]);
+      expect(w.firstChild().nodeType, 3);
+      expect(w.parentNode(), document.getElementsByTagName('h1')[0]);
+      expect(w.nextSibling().previousSibling.nodeType, 3);
+      expect(w.nextSibling(), document.getElementsByTagName('p')[6]);
+      expect(w.nextSibling(), document.getElementsByTagName('map')[0]);
+      expect(w.lastChild(), document.getElementsByTagName('table')[0]);
+      expect(w.lastChild(), document.getElementsByTagName('tbody')[0]);
+      expect(w.nextNode(), document.getElementsByTagName('tr')[0]);
+      expect(w.nextNode(), document.getElementsByTagName('td')[0]);
+      expect(w.nextNode(), document.getElementsByTagName('p')[7]);
+      expect(w.nextNode(), document.getElementsByTagName('p')[8]); // instructions.inc paragraph
+      expect(w.previousSibling(), document.getElementsByTagName('map')[0]);
+      expect(w.previousNode().data, "100");
+      expect(w.parentNode().tagName, "SPAN");
+      expect(w.parentNode(), document.getElementById('result'));
+      expect(w.parentNode(), document.body);
+      expect(w.lastChild().id, "instructions");
+      expect(w.lastChild().data.substr(0,1), ".");
+      expect(w.previousNode(), document.links[1].firstChild);
+      return 1;
+    },
+    function () {
+      // test 6: walking outside a tree
+      var doc = getTestDocument();
+      var p = doc.createElement('p');
+      doc.body.appendChild(p);
+      var b = doc.body;
+      var w = document.createTreeWalker(b, 0xFFFFFFFF, null, true);
+      assertEquals(w.currentNode, b, "basic use of TreeWalker failed: currentNode");
+      assertEquals(w.lastChild(), p, "basic use of TreeWalker failed: lastChild()");
+      assertEquals(w.previousNode(), b, "basic use of TreeWalker failed: previousNode()");
+      doc.documentElement.removeChild(b);
+      assertEquals(w.lastChild(), p, "TreeWalker failed after removing the current node from the tree");
+      assertEquals(w.nextNode(), null, "failed to walk into the end of a subtree");
+      doc.documentElement.appendChild(p);
+      assertEquals(w.previousNode(), doc.getElementsByTagName('title')[0], "failed to handle regrafting correctly");
+      p.appendChild(b);
+      assertEquals(w.nextNode(), p, "couldn't retrace steps");
+      assertEquals(w.nextNode(), b, "couldn't step back into root");
+      assertEquals(w.previousNode(), null, "root didn't retake its rootish position");
+      return 1;
+    },
+
+    // DOM Range
+    function () {
+      // test 7: basic ranges tests
+      var r = document.createRange();
+      assert(r, "range not created");
+      assert(r.collapsed, "new range wasn't collapsed");
+      assertEquals(r.commonAncestorContainer, document, "new range's common ancestor wasn't the document");
+      assertEquals(r.startContainer, document, "new range's start container wasn't the document");
+      assertEquals(r.startOffset, 0, "new range's start offset wasn't zero");
+      assertEquals(r.endContainer, document, "new range's end container wasn't the document");
+      assertEquals(r.endOffset, 0, "new range's end offset wasn't zero");
+      assert(r.cloneContents(), "cloneContents() didn't return an object");
+      assertEquals(r.cloneContents().childNodes.length, 0, "nothing cloned was more than nothing");
+      assertEquals(r.cloneRange().toString(), "", "nothing cloned stringifed to more than nothing");
+      r.collapse(true); // no effect
+      assertEquals(r.compareBoundaryPoints(r.START_TO_END, r.cloneRange()), 0, "starting boundary point of range wasn't the same as the end boundary point of the clone range");
+      r.deleteContents(); // no effect
+      assertEquals(r.extractContents().childNodes.length, 0, "nothing removed was more than nothing");
+      var endOffset = r.endOffset;
+      r.insertNode(document.createComment("commented inserted to test ranges"));
+      r.setEnd(r.endContainer, endOffset + 1); // added to work around spec bug that smaug is blocking the errata for
+      try {
+        assert(!r.collapsed, "range with inserted comment is collapsed");
+        assertEquals(r.commonAncestorContainer, document, "range with inserted comment has common ancestor that isn't the document");
+        assertEquals(r.startContainer, document, "range with inserted comment has start container that isn't the document");
+        assertEquals(r.startOffset, 0, "range with inserted comment has start offset that isn't zero");
+        assertEquals(r.endContainer, document, "range with inserted comment has end container that isn't the document");
+        assertEquals(r.endOffset, 1, "range with inserted comment has end offset that isn't after the comment");
+      } finally {
+        document.removeChild(document.firstChild);
+      }
+      return 1;
+    },
+    function () {
+      // test 8: moving boundary points
+      var doc = document.implementation.createDocument(null, null, null);
+      var root = doc.createElement("root");
+      doc.appendChild(root);
+      var e1 = doc.createElement("e");
+      root.appendChild(e1);
+      var e2 = doc.createElement("e");
+      root.appendChild(e2);
+      var e3 = doc.createElement("e");
+      root.appendChild(e3);
+      var r = doc.createRange();
+      r.setStart(e2, 0);
+      r.setEnd(e3, 0);
+      assert(!r.collapsed, "non-empty range claims to be collapsed");
+      r.setEnd(e1, 0);
+      assert(r.collapsed, "setEnd() didn't collapse the range");
+      assertEquals(r.startContainer, e1, "startContainer is wrong after setEnd()");
+      assertEquals(r.startOffset, 0, "startOffset is wrong after setEnd()");
+      assertEquals(r.endContainer, e1, "endContainer is wrong after setEnd()");
+      assertEquals(r.endOffset, 0, "endOffset is wrong after setEnd()");
+      r.setStartBefore(e3);
+      assert(r.collapsed, "setStartBefore() didn't collapse the range");
+      assertEquals(r.startContainer, root, "startContainer is wrong after setStartBefore()");
+      assertEquals(r.startOffset, 2, "startOffset is wrong after setStartBefore()");
+      assertEquals(r.endContainer, root, "endContainer is wrong after setStartBefore()");
+      assertEquals(r.endOffset, 2, "endOffset is wrong after setStartBefore()");
+      r.setEndAfter(root);
+      assert(!r.collapsed, "setEndAfter() didn't uncollapse the range");
+      assertEquals(r.startContainer, root, "startContainer is wrong after setEndAfter()");
+      assertEquals(r.startOffset, 2, "startOffset is wrong after setEndAfter()");
+      assertEquals(r.endContainer, doc, "endContainer is wrong after setEndAfter()");
+      assertEquals(r.endOffset, 1, "endOffset is wrong after setEndAfter()");
+      r.setStartAfter(e2);
+      assert(!r.collapsed, "setStartAfter() collapsed the range");
+      assertEquals(r.startContainer, root, "startContainer is wrong after setStartAfter()");
+      assertEquals(r.startOffset, 2, "startOffset is wrong after setStartAfter()");
+      assertEquals(r.endContainer, doc, "endContainer is wrong after setStartAfter()");
+      assertEquals(r.endOffset, 1, "endOffset is wrong after setStartAfter()");
+      var msg = '';
+      try {
+        r.setEndBefore(doc);
+        msg = "no exception thrown for setEndBefore() the document itself";
+      } catch (e) {
+// COMMENTED OUT FOR 2011 UPDATE - we may want to merge RangeException and DOMException
+//        if (e.BAD_BOUNDARYPOINTS_ERR != 1)
+//          msg = 'not a RangeException';
+//        else
+//        if (e.INVALID_NODE_TYPE_ERR != 2)
+//          msg = 'RangeException has no INVALID_NODE_TYPE_ERR';
+//        else
+//        if ("INVALID_ACCESS_ERR" in e)
+//          msg = 'RangeException has DOMException constants';
+//        else
+        if (e.code != e.INVALID_NODE_TYPE_ERR)
+          msg = 'wrong exception raised from setEndBefore()';
+      }
+      assert(msg == "", msg);
+      assert(!r.collapsed, "setEndBefore() collapsed the range");
+      assertEquals(r.startContainer, root, "startContainer is wrong after setEndBefore()");
+      assertEquals(r.startOffset, 2, "startOffset is wrong after setEndBefore()");
+      assertEquals(r.endContainer, doc, "endContainer is wrong after setEndBefore()");
+      assertEquals(r.endOffset, 1, "endOffset is wrong after setEndBefore()");
+      r.collapse(false);
+      assert(r.collapsed, "collapse() collapsed the range");
+      assertEquals(r.startContainer, doc, "startContainer is wrong after collapse()");
+      assertEquals(r.startOffset, 1, "startOffset is wrong after collapse()");
+      assertEquals(r.endContainer, doc, "endContainer is wrong after collapse()");
+      assertEquals(r.endOffset, 1, "endOffset is wrong after collapse()");
+      r.selectNodeContents(root);
+      assert(!r.collapsed, "collapsed is wrong after selectNodeContents()");
+      assertEquals(r.startContainer, root, "startContainer is wrong after selectNodeContents()");
+      assertEquals(r.startOffset, 0, "startOffset is wrong after selectNodeContents()");
+      assertEquals(r.endContainer, root, "endContainer is wrong after selectNodeContents()");
+      assertEquals(r.endOffset, 3, "endOffset is wrong after selectNodeContents()");
+      r.selectNode(e2);
+      assert(!r.collapsed, "collapsed is wrong after selectNode()");
+      assertEquals(r.startContainer, root, "startContainer is wrong after selectNode()");
+      assertEquals(r.startOffset, 1, "startOffset is wrong after selectNode()");
+      assertEquals(r.endContainer, root, "endContainer is wrong after selectNode()");
+      assertEquals(r.endOffset, 2, "endOffset is wrong after selectNode()");
+      return 1;
+    },
+    function () {
+      // test 9: extractContents() in a Document
+      var doc = getTestDocument();
+      var h1 = doc.createElement('h1');
+      var t1 = doc.createTextNode('Hello ');
+      h1.appendChild(t1);
+      var em = doc.createElement('em');
+      var t2 = doc.createTextNode('Wonderful');
+      em.appendChild(t2);
+      h1.appendChild(em);
+      var t3 = doc.createTextNode(' Kitty');
+      h1.appendChild(t3);
+      doc.body.appendChild(h1);
+      var p = doc.createElement('p');
+      var t4 = doc.createTextNode('How are you?');
+      p.appendChild(t4);
+      doc.body.appendChild(p);
+      var r = doc.createRange();
+      r.selectNodeContents(doc);
+      assertEquals(r.toString(), "Hello Wonderful KittyHow are you?", "toString() on range selecting Document gave wrong output");
+      r.setStart(t2, 6);
+      r.setEnd(p, 0);
+      // <body><h1>Hello <em>Wonder ful<\em> Kitty<\h1><p> How are you?<\p><\body>     (the '\'s are to avoid validation errors)
+      //                           ^----------------------^
+      assertEquals(r.toString(), "ful Kitty", "toString() on range crossing text nodes gave wrong output");
+      var f = r.extractContents();
+      // <h1><em>ful<\em> Kitty<\h1><p><\p>
+      // ccccccccccccccccMMMMMMcccccccccccc
+      assertEquals(f.nodeType, 11, "failure 1");
+      assert(f.childNodes.length == 2, "expected two children in the result, got " + f.childNodes.length);
+      assertEquals(f.childNodes[0].tagName, "H1", "failure 3");
+      assert(f.childNodes[0] != h1, "failure 4");
+      assertEquals(f.childNodes[0].childNodes.length, 2, "failure 5");
+      assertEquals(f.childNodes[0].childNodes[0].tagName, "EM", "failure 6");
+      assert(f.childNodes[0].childNodes[0] != em, "failure 7");
+      assertEquals(f.childNodes[0].childNodes[0].childNodes.length, 1, "failure 8");
+      assertEquals(f.childNodes[0].childNodes[0].childNodes[0].data, "ful", "failure 9");
+      assert(f.childNodes[0].childNodes[0].childNodes[0] != t2, "failure 10");
+      assertEquals(f.childNodes[0].childNodes[1], t3, "failure 11");
+      assert(f.childNodes[0].childNodes[1] != em, "failure 12");
+      assertEquals(f.childNodes[1].tagName, "P", "failure 13");
+      assertEquals(f.childNodes[1].childNodes.length, 0, "failure 14");
+      assert(f.childNodes[1] != p, "failure 15");
+      return 1;
+    },
+    function () {
+      // test 10: Ranges and Attribute Nodes
+// COMMENTED OUT FOR 2011 UPDATE - turns out instead of dropping Attr entirely, as Acid3 originally expected, the API is just being refactored
+//      var e = document.getElementById('result');
+//      if (!e.getAttributeNode)
+//        return 1; // support for attribute nodes is optional in Acid3, because attribute nodes might be removed from DOM Core in the future.
+//      // however, if they're supported, they'd better work:
+//      var a = e.getAttributeNode('id');
+//      var r = document.createRange();
+//      r.selectNodeContents(a);
+//      assertEquals(r.toString(), "result", "toString() didn't work for attribute node");
+//      var t = a.firstChild;
+//      var f = r.extractContents();
+//      assertEquals(f.childNodes.length, 1, "extracted contents were the wrong length");
+//      assertEquals(f.childNodes[0], t, "extracted contents were the wrong node");
+//      assertEquals(t.textContent, 'result', "extracted contents didn't match old attribute value");
+//      assertEquals(r.toString(), '', "extracting contents didn't empty attribute value; instead equals '" + r.toString() + "'");
+//      assertEquals(e.getAttribute('id'), '', "extracting contents didn't change 'id' attribute to empty string");
+//      e.id = 'result';
+      return 1;
+    },
+    function () {
+      // test 11: Ranges and Comments
+      var msg;
+      var doc = getTestDocument();
+      var c1 = doc.createComment("11111");
+      doc.appendChild(c1);
+      var r = doc.createRange();
+      r.selectNode(c1);
+      msg = 'wrong exception raised';
+      try {
+        r.surroundContents(doc.createElement('a'));
+        msg = 'no exception raised';
+      } catch (e) {
+        if ('code' in e)
+          msg += '; code = ' + e.code;
+        if (e.code == 3) // HIERARCHY_REQUEST_ERR
+          msg = '';
+      }
+      assert(msg == '', "when inserting <a> into Document with another child: " + msg);
+      var c2 = doc.createComment("22222");
+      doc.body.appendChild(c2);
+      var c3 = doc.createComment("33333");
+      doc.body.appendChild(c3);
+      r.setStart(c2, 2);
+      r.setEnd(c3, 3);
+      var msg = 'wrong exception raised';
+      try {
+        r.surroundContents(doc.createElement('a'));
+        msg = 'no exception raised';
+      } catch (e) {
+// COMMENTED OUT FOR 2011 UPDATE - DOM Core changes the exception from RangeException.BAD_BOUNDARYPOINTS_ERR (1) to DOMException.INVALID_STATE_ERR (11)
+//        if ('code' in e)
+//          msg += '; code = ' + e.code;
+//        if (e.code == 1)
+          msg = '';
+      }
+      assert(msg == '', "when trying to surround two halves of comment: " + msg);
+      assertEquals(r.toString(), "", "comments returned text");
+      return 1;
+    },
+    function () {
+      // test 12: Ranges under mutations: insertion into text nodes
+      var doc = getTestDocument();
+      var p = doc.createElement('p');
+      var t1 = doc.createTextNode('12345');
+      p.appendChild(t1);
+      var t2 = doc.createTextNode('ABCDE');
+      p.appendChild(t2);
+      doc.body.appendChild(p);
+      var r = doc.createRange();
+      r.setStart(p.firstChild, 2);
+      r.setEnd(p.firstChild, 3);
+      assert(!r.collapsed, "collapsed is wrong at start");
+      assertEquals(r.commonAncestorContainer, p.firstChild, "commonAncestorContainer is wrong at start");
+      assertEquals(r.startContainer, p.firstChild, "startContainer is wrong at start");
+      assertEquals(r.startOffset, 2, "startOffset is wrong at start");
+      assertEquals(r.endContainer, p.firstChild, "endContainer is wrong at start");
+      assertEquals(r.endOffset, 3, "endOffset is wrong at start");
+      assertEquals(r.toString(), "3", "range in text node stringification failed");
+      r.insertNode(p.lastChild);
+      assertEquals(p.childNodes.length, 3, "insertion of node made wrong number of child nodes");
+      assertEquals(p.childNodes[0], t1, "unexpected first text node");
+      assertEquals(p.childNodes[0].data, "12", "unexpected first text node contents");
+      assertEquals(p.childNodes[1], t2, "unexpected second text node");
+      assertEquals(p.childNodes[1].data, "ABCDE", "unexpected second text node");
+      assertEquals(p.childNodes[2].data, "345", "unexpected third text node contents");
+      // The spec is very vague about what exactly should be in the range afterwards:
+      // the insertion results in a splitText(), which it says is equivalent to a truncation
+      // followed by an insertion, but it doesn't say what to do when you have a truncation,
+      // so we don't know where either the start or the end boundary points end up.
+      // The spec really should be clarified for how to handle splitText() and
+      // text node truncation in general
+      // The only thing that seems very clear is that the inserted text node should
+      // be in the range, and it has to be at the start, since insertion always puts it at
+      // the start.
+      assert(!r.collapsed, "collapsed is wrong after insertion");
+      assert(r.toString().match(/^ABCDE/), "range didn't start with the expected text; range stringified to '" + r.toString() + "'");
+      return 1;
+    },
+    function () {
+      // test 13: Ranges under mutations: deletion
+      var doc = getTestDocument();
+      var p = doc.createElement('p');
+      p.appendChild(doc.createTextNode("12345"));
+      doc.body.appendChild(p);
+      var r = doc.createRange();
+      r.setEnd(doc.body, 1);
+      r.setStart(p.firstChild, 2);
+      assert(!r.collapsed, "collapsed is wrong at start");
+      assertEquals(r.commonAncestorContainer, doc.body, "commonAncestorContainer is wrong at start");
+      assertEquals(r.startContainer, p.firstChild, "startContainer is wrong at start");
+      assertEquals(r.startOffset, 2, "startOffset is wrong at start");
+      assertEquals(r.endContainer, doc.body, "endContainer is wrong at start");
+      assertEquals(r.endOffset, 1, "endOffset is wrong at start");
+      doc.body.removeChild(p);
+      assert(r.collapsed, "collapsed is wrong after deletion");
+      assertEquals(r.commonAncestorContainer, doc.body, "commonAncestorContainer is wrong after deletion");
+      assertEquals(r.startContainer, doc.body, "startContainer is wrong after deletion");
+      assertEquals(r.startOffset, 0, "startOffset is wrong after deletion");
+      assertEquals(r.endContainer, doc.body, "endContainer is wrong after deletion");
+      assertEquals(r.endOffset, 0, "endOffset is wrong after deletion");
+      return 1;
+    },
+
+    // HTTP
+    function () {
+      // test 14: HTTP - Content-Type: image/png
+      assert(!notifications['empty.png'], "privilege escalation security bug: PNG ran script");
+      var iframe = document.getElementsByTagName('iframe')[0];
+      assert(iframe, "no <iframe> support");
+      if (iframe && iframe.contentDocument) {
+        var ps = iframe.contentDocument.getElementsByTagName('p');
+        if (ps.length > 0) {
+          if (ps[0].firstChild && ps[0].firstChild.data && ps[0].firstChild.data == 'FAIL')
+            fail("PNG was parsed as HTML.");
+        }
+      }
+      return 1;
+    },
+    function () {
+      // test 15: HTTP - Content-Type: text/plain
+      assert(!notifications['empty.txt'], "privilege escalation security bug: text file ran script");
+      var iframe = document.getElementsByTagName('iframe')[1];
+      assert(iframe, "no <iframe> support");
+      if (iframe && iframe.contentDocument) {
+        var ps = iframe.contentDocument.getElementsByTagName('p');
+        if (ps.length > 0) {
+          if (ps[0].firstChild && ps[0].firstChild.data && ps[0].firstChild.data == 'FAIL')
+            fail("text/plain file was parsed as HTML");
+        }
+      }
+      return 1;
+    },
+    function () {
+      // test 16: <object> handling and HTTP status codes
+      var oC = document.createElement('object');
+      oC.appendChild(document.createTextNode("FAIL"));
+      var oB = document.createElement('object');
+      var oA = document.createElement('object');
+      oA.data = "support-a.png?pipe=status(404)";
+      oB.data = "support-b.png";
+      oB.appendChild(oC);
+      oC.data = "support-c.png";
+      oA.appendChild(oB);
+      document.getElementsByTagName("map")[0].appendChild(oA);
+      // assuming the above didn't raise any exceptions, this test has passed
+      // (the real test is whether the rendering is correct)
+      return 1;
+    },
+
+    // bucket 2: DOM2 Core and DOM2 Events
+    // Core
+    function () {
+      // test 17: hasAttribute
+      // missing attribute
+      assert(!document.getElementsByTagName('map')[0].hasAttribute('id'), "hasAttribute failure for 'id' on map");
+      // implied attribute
+      assert(!document.getElementsByTagName('form')[0].hasAttribute('method'), "hasAttribute failure for 'method' on form");
+      // actually present attribute
+      assert(document.getElementsByTagName('form')[0].hasAttribute('action'), "hasAttribute failure for 'action' on form");
+      assertEquals(document.getElementsByTagName('form')[0].getAttribute('action'), '', "attribute 'action' on form has wrong value");
+      return 2;
+    },
+    function () {
+      // test 18: nodeType (this test also relies on accurate parsing of the document)
+      assertEquals(document.nodeType, 9, "document nodeType wrong");
+      assertEquals(document.documentElement.nodeType, 1, "element nodeType wrong");
+// COMMENTED OUT FOR 2011 UPDATE - turns out instead of dropping Attr entirely, as Acid3 originally expected, the API is just being refactored
+//      if (document.createAttribute) // support for attribute nodes is optional in Acid3, because attribute nodes might be removed from DOM Core in the future.
+//        assertEquals(document.createAttribute('test').nodeType, 2, "attribute nodeType wrong"); // however, if they're supported, they'd better work
+      assertEquals(document.getElementById('score').firstChild.nodeType, 3, "text node nodeType wrong");
+      assertEquals(document.firstChild.nodeType, 10, "DOCTYPE nodeType wrong");
+      return 2;
+    },
+    function () {
+      // test 19: value of constants
+      var e = null;
+      try {
+        document.body.appendChild(document.documentElement);
+         // raises a HIERARCHY_REQUEST_ERR
+      } catch (err) {
+        e = err;
+      }
+      assertEquals(document.DOCUMENT_FRAGMENT_NODE, 11, "document DOCUMENT_FRAGMENT_NODE constant missing or wrong");
+      assertEquals(document.body.COMMENT_NODE, 8, "element COMMENT_NODE constant missing or wrong");
+      assertEquals(document.createTextNode('').ELEMENT_NODE, 1, "text node ELEMENT_NODE constant missing or wrong");
+      assert(e.HIERARCHY_REQUEST_ERR == 3, "exception HIERARCHY_REQUEST_ERR constant missing or wrong")
+      assertEquals(e.code, 3, "incorrect exception raised from appendChild()");
+      return 2;
+    },
+    function () {
+      // test 20: nulls bytes in various places
+      assert(!document.getElementById('bucket1\0error'), "null in getElementById() probably terminated string");
+      var ok = true;
+      try {
+        document.createElement('form\0div');
+        ok = false;
+      } catch (e) {
+        if (e.code != 5)
+          ok = false;
+      }
+      assert(ok, "didn't raise the right exception for null byte in createElement()");
+      return 2;
+    },
+    function () {
+      // test 21: basic namespace stuff
+      var element = document.createElementNS('http://ns.example.com/', 'prefix:localname');
+      assertEquals(element.tagName, 'prefix:localname', "wrong tagName");
+      assertEquals(element.nodeName, 'prefix:localname', "wrong nodeName");
+      assertEquals(element.prefix, 'prefix', "wrong prefix");
+      assertEquals(element.localName, 'localname', "wrong localName");
+      assertEquals(element.namespaceURI, 'http://ns.example.com/', "wrong namespaceURI");
+      return 2;
+    },
+    function () {
+      // test 22: createElement() with invalid tag names
+      var test = function (name) {
+        var result;
+        try {
+          var div = document.createElement(name);
+        } catch (e) {
+          result = e;
+        }
+        assert(result, "no exception for createElement('" + name + "')");
+        assertEquals(result.code, 5, "wrong exception for createElement('" + name + "')"); // INVALID_CHARACTER_ERR
+      }
+      test('<div>');
+      test('0div');
+      test('di v');
+      test('di<v');
+      test('-div');
+      test('.div');
+      return 2;
+    },
+    function () {
+      // test 23: createElementNS() with invalid tag names
+      var test = function (name, ns, code) {
+        var result;
+        try {
+          var div = document.createElementNS(ns, name);
+        } catch (e) {
+          result = e;
+        }
+        assert(result, "no exception for createElementNS('" + ns + "', '" + name + "')");
+        assertEquals(result.code, code, "wrong exception for createElementNS('" + ns + "', '" + name + "')");
+      }
+      test('<div>', null, 5);
+      test('0div', null, 5);
+      test('di v', null, 5);
+      test('di<v', null, 5);
+      test('-div', null, 5);
+      test('.div', null, 5);
+      test('<div>', "http://example.com/", 5);
+      test('0div', "http://example.com/", 5);
+      test('di<v', "http://example.com/", 5);
+      test('-div', "http://example.com/", 5);
+      test('.div', "http://example.com/", 5);
+      test(':div', null, 14);
+      test(':div', "http://example.com/", 14);
+      test('d:iv', null, 14);
+      test('xml:test', "http://example.com/", 14);
+      test('xmlns:test', "http://example.com/", 14); // (technically a DOM3 Core test)
+      test('x:test', "http://www.w3.org/2000/xmlns/", 14); // (technically a DOM3 Core test)
+      document.createElementNS("http://www.w3.org/2000/xmlns/", 'xmlns:test'); // (technically a DOM3 Core test)
+      return 2;
+    },
+    function () {
+      // test 24: event handler attributes
+      assertEquals(document.body.getAttribute('onload'), "update()  /* this attribute's value is tested in one of the tests */ ", "onload value wrong");
+      return 2;
+    },
+    function () {
+      // test 25: test namespace checking in createDocumentType, and
+      // check that exceptions that are thrown are DOMException objects
+      var message = "";
+      try {
+        document.implementation.createDocumentType('a:', '', ''); /* doesn't contain an illegal character; is malformed */
+        message = "failed to raise exception";
+      } catch (e) {
+        if (e.code != e.NAMESPACE_ERR)
+          message = "wrong exception";
+        else if (e.INVALID_ACCESS_ERR != 15)
+          message = "exceptions don't have all the constants";
+      }
+      if (message)
+        fail(message);
+      return 2;
+    },
+    function () {
+      // test 26: check that document tree survives while still accessible
+      var d;
+      // e1 - an element that's in a document
+      d = document.implementation.createDocument(null, null, null);
+      var e1 = d.createElement('test');
+      d.appendChild(d.createElement('root'));
+      d.documentElement.appendChild(e1);
+      assert(e1.parentNode, "e1 - parent element doesn't exist");
+      assert(e1.parentNode.ownerDocument, "e1 - document doesn't exist");
+      // e2 - an element that's not in a document
+      d = document.implementation.createDocument(null, null, null);
+      var e2 = d.createElement('test');
+      d.createElement('root').appendChild(e2);
+      assert(e2.parentNode, "e2 - parent element doesn't exist");
+      assert(e2.parentNode.ownerDocument, "e2 - document doesn't exist");
+      // now try to decouple them
+      d = null;
+      kungFuDeathGrip = [e1, e2];
+      assert(e1.parentNode, "e1 - parent element doesn't exist after dropping reference to document");
+      assert(e1.parentNode.ownerDocument, "e1 - document doesn't exist after dropping reference to document");
+      assert(e2.parentNode, "e2 - parent element doesn't exist after dropping reference to document");
+      assert(e2.parentNode.ownerDocument, "e2 - document doesn't exist after dropping reference to document");
+      var loops = new Date().valueOf() * 2.813435e-9 - 2412; // increases linearly over time
+      for (var i = 0; i < loops; i += 1) {
+        // we want to force a GC here, so we use up lots of memory
+        // we take the opportunity to sneak in a perf test to make DOM and JS stuff faster...
+        d = new Date();
+        d = new (function (x) { return { toString: function () { return x.toString() } } })(d.valueOf());
+        d = document.createTextNode("iteration " + i + " at " + d);
+        document.createElement('a').appendChild(d);
+        d = d.parentNode;
+        document.body.insertBefore(d, document.getElementById('bucket1').parentNode);
+        assert(document.getElementById('bucket2').nextSibling.parentNode.previousSibling.firstChild.data.match(/AT\W/i), "iteration " + i + " failed");
+        d.setAttribute('class', d.textContent);
+        document.body.removeChild(d);
+      }
+      assert(e1.parentNode, "e1 - parent element doesn't exist after looping");
+      assert(e1.parentNode.ownerDocument, "e1 - document doesn't exist after looping");
+      assertEquals(e1.parentNode.ownerDocument.nodeType, 9, "e1 - document node type has wrong node type");
+      assert(e2.parentNode, "e2 - parent element doesn't exist after looping");
+      assert(e2.parentNode.ownerDocument, "e2 - document doesn't exist after looping");
+      assertEquals(e2.parentNode.ownerDocument.nodeType, 9, "e2 - document node type has wrong node type");
+      return 2;
+    },
+    function () {
+      // test 27: a continuation of the previous test
+      var e1 = kungFuDeathGrip[0];
+      var e2 = kungFuDeathGrip[1];
+      kungFuDeathGrip = null;
+      assert(e1, "e1 - element itself didn't survive across tests");
+      assert(e1.parentNode, "e1 - parent element doesn't exist after waiting");
+      assert(e1.parentNode.ownerDocument, "e1 - document doesn't exist after waiting");
+      assertEquals(e1.parentNode.ownerDocument.nodeType, 9, "e1 - document node type has wrong node type after waiting");
+      assert(e2, "e2 - element itself didn't survive across tests");
+      assert(e2.parentNode, "e2 - parent element doesn't exist after waiting");
+      assert(e2.parentNode.ownerDocument, "e2 - document doesn't exist after waiting");
+      assertEquals(e2.parentNode.ownerDocument.nodeType, 9, "e2 - document node type has wrong node type after waiting");
+      return 2;
+    },
+    function () {
+      // test 28: getElementById()
+      // ...and name=""
+      assert(document.getElementById('form') !== document.getElementsByTagName('form')[0], "getElementById() searched on 'name'");
+      // ...and a space character as the ID
+      var div = document.createElement('div');
+      div.appendChild(document.createTextNode('FAIL'));
+      div.id = " ";
+      document.body.appendChild(div); // it's hidden by CSS
+      assert(div === document.getElementById(" "), "getElementById() didn't return the right element");
+      return 2;
+    },
+    function () {
+      // test 29: check that whitespace survives cloning
+      var t1 = document.getElementsByTagName('table')[0];
+      var t2 = t1.cloneNode(true);
+      assertEquals(t2.tBodies[0].rows[0].cells[0].firstChild.tagName, 'P', "<p> didn't clone right");
+      assertEquals(t2.tBodies[0].rows[0].cells[0].firstChild.childNodes.length, 0, "<p> got child nodes after cloning");
+      assertEquals(t2.childNodes.length, 2, "cloned table had wrong number of children");
+      assertEquals(t2.lastChild.data, " ", "cloned table lost whitespace text node");
+      return 2;
+    },
+
+    // Events
+    function () {
+      // test 30: dispatchEvent()
+      var count = 0;
+      var ok = true;
+      var test = function (event) {
+        if (event.detail != 6)
+          ok = false;
+        count++;
+      };
+      // test event listener addition
+      document.getElementById('result').addEventListener('test', test, false);
+      // test event creation
+      var event = document.createEvent('UIEvents');
+      event.initUIEvent('test', true, false, null, 6);
+      // test event dispatch on elements and text nodes
+      assert(document.getElementById('score').dispatchEvent(event), "dispatchEvent #1 failed");
+      assert(document.getElementById('score').nextSibling.dispatchEvent(event), "dispatchEvent #2 failed");
+      // test event listener removal
+      document.getElementById('result').removeEventListener('test', test, false);
+      assert(document.getElementById('score').dispatchEvent(event), "dispatchEvent #3 failed");
+      assertEquals(count, 2, "unexpected number of events handled");
+      assert(ok, "unexpected events handled");
+      return 2;
+    },
+    function () {
+      // test 31: event.stopPropagation() and capture
+      // we're going to use an input element because we can cause events to bubble from it
+      var input = document.createElement('input');
+      var div = document.createElement('div');
+      div.appendChild(input);
+      document.body.appendChild(div);
+      // the test will consist of two event handlers:
+      var ok = true;
+      var captureCount = 0;
+      var testCapture = function (event) {
+        ok = ok &&
+             (event.type == 'click') &&
+             (event.target == input) &&
+             (event.currentTarget == div) &&
+             (event.eventPhase == 1) &&
+             (event.bubbles) &&
+             (event.cancelable);
+        captureCount++;
+        event.stopPropagation(); // this shouldn't stop it from firing both times on the div element
+      };
+      var testBubble = function (event) {
+        ok = false;
+      };
+      // one of which is added twice:
+      div.addEventListener('click', function (event) { testCapture(event) }, true);
+      div.addEventListener('click', function (event) { testCapture(event) }, true);
+      div.addEventListener('click', testBubble, false);
+      // we cause an event to bubble like this:
+      input.type = 'reset';
+      input.click();
+      // cleanup afterwards
+      document.body.removeChild(div);
+      // capture handler should have been called twice
+      assertEquals(captureCount, 2, "capture handler called the wrong number of times");
+      assert(ok, "capture handler called incorrectly");
+      return 2;
+    },
+    function () {
+      // test 32: events bubbling through Document node
+      // event handler:
+      var ok = true;
+      var count = 0;
+      var test = function (event) {
+        count += 1;
+        if (event.eventPhase != 3)
+          ok = false;
+      }
+      // register event handler
+      document.body.addEventListener('click', test, false);
+      // create an element that bubbles an event, and bubble it
+      var input = document.createElement('input');
+      var div = document.createElement('div');
+      div.appendChild(input);
+      document.body.appendChild(div);
+      input.type = 'reset';
+      input.click();
+      // unregister event handler
+      document.body.removeEventListener('click', test, false);
+      // check that it's removed for good
+      input.click();
+      // remove the newly added elements
+      document.body.removeChild(div);
+      assertEquals(count, 1, "capture handler called the wrong number of times");
+      assert(ok, "capture handler called incorrectly");
+      return 2;
+    },
+
+    // bucket 3: DOM2 Views, DOM2 Style, and Selectors
+    function () {
+      // test 33: basic tests for selectors - classes, attributes
+      var p;
+      var builder = function(doc) {
+        p = doc.createElement("p");
+        doc.body.appendChild(p);
+      };
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        p.className = "selectorPingTest";
+        var good = add(".selectorPingTest");
+        add(".SelectorPingTest");
+        add(".selectorpingtest");
+        expect(doc.body, 0, "failure 1");
+        expect(p, good, "failure 2");
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        p.className = 'a\u0020b\u0009c\u000Ad\u000De\u000Cf\u2003g\u3000h';
+        var good = add(".a.b.c.d.e.f\\2003g\\3000h");
+        expect(p, good, "whitespace error in class processing");
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        p.className = "selectorPingTest";
+        var good = add("[class=selectorPingTest]");
+        add("[class=SelectorPingTest]");
+        add("[class=selectorpingtest]");
+        expect(doc.body, 0, "failure 3");
+        expect(p, good, "class attribute matching failed");
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        p.className = "selectorPingTest";
+        var good = add("[title=selectorPingTest]");
+        add("[title=SelectorPingTest]");
+        add("[title=selectorpingtest]");
+        expect(doc.body, 0, "failure 4");
+        expect(p, 0, "failure 5");
+        p.title = "selectorPingTest";
+        expect(doc.body, 0, "failure 6");
+        expect(p, good, "failure 7");
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        p.setAttribute('align', 'right and left');
+        var good = add("[align=\"right and left\"]");
+        add("[align=left]");
+        add("[align=right]");
+        expect(p, good, "align attribute mismatch");
+      });
+      return 3;
+    },
+    function () {
+      // test 34: :lang() and [|=]
+      var div1;
+      var div2;
+      var p;
+      var builder = function(doc) {
+        div1 = doc.createElement('div');
+        div1.setAttribute("lang", "english");
+        div1.setAttribute("class", "widget-tree");
+        doc.body.appendChild(div1);
+        div2 = doc.createElement('div');
+        div2.setAttribute("lang", "en-GB");
+        div2.setAttribute("class", "WIDGET");
+        doc.body.appendChild(div2);
+        p = doc.createElement('p');
+        div2.appendChild(p);
+      };
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var lang_en = add(":lang(en)");
+        expect(div1, 0, "lang=english should not be matched by :lang(en)");
+        expect(div2, lang_en, "lang=en-GB should be matched by :lang(en)");
+        expect(p, lang_en, "descendants inheriting lang=en-GB should be matched by :lang(en)");
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var class_widget = add("[class|=widget]");
+        expect(div1, class_widget, "class attribute should be supported by |= attribute selectors");
+        expect(div2, 0, "class attribute is case-sensitive");
+      });
+      return 3;
+    },
+    function () {
+      // test 35: :first-child
+      selectorTest(function (doc, add, expect) {
+        var notFirst = 0;
+        var first = add(":first-child");
+        var p1 = doc.createElement("p");
+        doc.body.appendChild(doc.createTextNode(" TEST "));
+        doc.body.appendChild(p1);
+        expect(doc.documentElement, notFirst, "root element, with no parent node, claims to be a :first-child");
+        expect(doc.documentElement.firstChild, first, "first child of root node didn't match :first-child");
+        expect(doc.documentElement.firstChild.firstChild, first, "failure 3");
+        expect(doc.body, notFirst, "failure 4");
+        expect(p1, first, "failure 5");
+        var p2 = doc.createElement("p");
+        doc.body.appendChild(p2);
+        expect(doc.body, notFirst, "failure 6");
+        expect(p1, first, "failure 7");
+        expect(p2, notFirst, "failure 8");
+        var p0 = doc.createElement("p");
+        doc.body.insertBefore(p0, p1);
+        expect(doc.body, notFirst, "failure 9");
+        expect(p0, first, "failure 10");
+        expect(p1, notFirst, ":first-child still applies to element that was previously a first child");
+        expect(p2, notFirst, "failure 12");
+        doc.body.insertBefore(p0, p2);
+        expect(doc.body, notFirst, "failure 13");
+        expect(p1, first, "failure 14");
+        expect(p0, notFirst, "failure 15");
+        expect(p2, notFirst, "failure 16");
+      });
+      return 3;
+    },
+    function () {
+      // test 36: :last-child
+      var p1;
+      var p2;
+      var builder = function(doc) {
+        p1 = doc.createElement('p');
+        p2 = doc.createElement('p');
+        doc.body.appendChild(p1);
+        doc.body.appendChild(p2);
+      };
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var last = add(":last-child");
+        expect(p1, 0, "control test for :last-child failed");
+        expect(p2, last, "last child did not match :last-child");
+        doc.body.appendChild(p1);
+        expect(p2, 0, ":last-child matched element with a following sibling");
+        expect(p1, last, "failure 4");
+        p1.appendChild(p2);
+        expect(p2, last, "failure 5");
+        expect(p1, last, "failure 6");
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var last = add(":last-child");
+        expect(p1, 0, "failure 7");
+        expect(p2, last, "failure 8");
+        doc.body.insertBefore(p2, p1);
+        expect(p2, 0, "failure 9");
+        expect(p1, last, "failure 10");
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var last = add(":last-child");
+        expect(p1, 0, "failure 11");
+        expect(p2, last, "failure 12");
+        doc.body.removeChild(p2);
+        expect(p1, last, "failure 13");
+        assertEquals(p1.nextSibling, null, "failure 14");
+        assertEquals(p2.parentNode, null, "failure 15");
+      });
+      return 3;
+    },
+    function () {
+      // test 37: :only-child
+      var p1;
+      var p2;
+      var builder = function(doc) {
+        p1 = doc.createElement('p');
+        p2 = doc.createElement('p');
+        doc.body.appendChild(p1);
+        doc.body.appendChild(p2);
+      };
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var only = add(":only-child");
+        expect(p1, 0, "control test for :only-child failed");
+        expect(p2, 0, "failure 2");
+        doc.body.removeChild(p2);
+        expect(p1, only, ":only-child did not match only child");
+        p1.appendChild(p2);
+        expect(p2, only, "failure 4");
+        expect(p1, only, "failure 5");
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var only = add(":only-child");
+        expect(p1, 0, "failure 6");
+        expect(p2, 0, "failure 7");
+        doc.body.removeChild(p1);
+        expect(p2, only, "failure 8");
+        p2.appendChild(p1);
+        expect(p2, only, "failure 9");
+        expect(p1, only, "failure 10");
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var only = add(":only-child");
+        expect(p1, 0, "failure 11");
+        expect(p2, 0, "failure 12");
+        var span1 = doc.createElement('span');
+        p1.appendChild(span1);
+        expect(p1, 0, "failure 13");
+        expect(p2, 0, "failure 14");
+        expect(span1, only, "failure 15");
+        var span2 = doc.createElement('span');
+        p1.appendChild(span2);
+        expect(p1, 0, "failure 16");
+        expect(p2, 0, "failure 17");
+        expect(span1, 0, "failure 18");
+        expect(span2, 0, "failure 19");
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var only = add(":only-child");
+        expect(p1, 0, "failure 20");
+        expect(p2, 0, "failure 21");
+        var span1 = doc.createElement('span');
+        p2.appendChild(span1);
+        expect(p1, 0, "failure 22");
+        expect(p2, 0, "failure 23");
+        expect(span1, only, "failure 24");
+        var span2 = doc.createElement('span');
+        p2.insertBefore(span2, span1);
+        expect(p1, 0, "failure 25");
+        expect(p2, 0, "failure 26");
+        expect(span1, 0, "failure 27");
+        expect(span2, 0, "failure 28");
+      });
+      return 3;
+    },
+    function () {
+      // test 38: :empty
+      selectorTest(function (doc, add, expect) {
+        var empty = add(":empty");
+        var p = doc.createElement('p');
+        doc.body.appendChild(p);
+        expect(p, empty, "empty p element didn't match :empty");
+        var span = doc.createElement('span');
+        p.appendChild(span);
+        expect(p, 0, "adding children didn't stop the element matching :empty");
+        expect(span, empty, "empty span element didn't match :empty");
+        p.removeChild(span);
+        expect(p, empty, "removing all children didn't make the element match :empty");
+        p.appendChild(doc.createComment("c"));
+        p.appendChild(doc.createTextNode(""));
+        expect(p, empty, "element with a comment node and an empty text node didn't match :empty");
+        p.appendChild(doc.createTextNode(""));
+        expect(p, empty, "element with a comment node and two empty text nodes didn't match :empty");
+        p.lastChild.data = " ";
+        expect(p, 0, "adding text to a text node didn't make the element non-:empty");
+        assertEquals(p.childNodes.length, 3, "text nodes may have merged");
+// COMMENTED OUT FOR 2011 UPDATE - replaceWholeText() might go away entirely
+//        p.childNodes[1].replaceWholeText("");
+//        assertEquals(p.childNodes.length, 1, "replaceWholeText('') didn't remove text nodes");
+// REPLACEMENT:
+        assertEquals(p.childNodes[1].nodeType, 3, "missing text node before first removal");
+        p.removeChild(p.childNodes[1]);
+        assertEquals(p.childNodes[1].nodeType, 3, "missing text node before second removal");
+        p.removeChild(p.childNodes[1]);
+// END REPLACEMENT TEST
+        expect(p, empty, "element with a comment node only didn't match :empty");
+        p.appendChild(doc.createElementNS("http://example.com/", "test"));
+        expect(p, 0, "adding an element in a namespace didn't make the element non-:empty");
+      });
+      return 3;
+    },
+    function () {
+      // test 39: :nth-child, :nth-last-child
+      var ps;
+      var builder = function(doc) {
+        ps = [
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p')
+        ];
+        for (var i = 0; i < ps.length; i += 1)
+          doc.body.appendChild(ps[i]);
+      };
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":nth-child(odd)");
+        for (var i = 0; i < ps.length; i += 1)
+          expect(ps[i], i % 2 ? 0 : match, ":nth-child(odd) failed with child " + i);
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":nth-child(even)");
+        for (var i = 0; i < ps.length; i += 1)
+          expect(ps[i], i % 2 ? match : 0 , ":nth-child(even) failed with child " + i);
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":nth-child(odd)");
+        doc.body.removeChild(ps[5]);
+        for (var i = 0; i < 5; i += 1)
+          expect(ps[i], i % 2 ? 0 : match, ":nth-child(odd) failed after removal with child " + i);
+        for (var i = 6; i < ps.length; i += 1)
+          expect(ps[i], i % 2 ? match : 0, ":nth-child(odd) failed after removal with child " + i);
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":nth-child(even)");
+        doc.body.removeChild(ps[5]);
+        for (var i = 0; i < 5; i += 1)
+          expect(ps[i], i % 2 ? match : 0, ":nth-child(even) failed after removal with child " + i);
+        for (var i = 6; i < ps.length; i += 1)
+          expect(ps[i], i % 2 ? 0 : match, ":nth-child(even) failed after removal with child " + i);
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":nth-child(-n+3)");
+        for (var i = 0; i < 3; i += 1)
+          expect(ps[i], match, ":nth-child(-n+3) failed with child " + i);
+        for (var i = 3; i < ps.length; i += 1)
+          expect(ps[i], 0, ":nth-child(-n+3) failed with child " + i);
+      });
+      return 3;
+    },
+    function () {
+      // test 40: :first-of-type, :last-of-type, :only-of-type, :nth-of-type, :nth-last-of-type
+      var elements;
+      var builder = function(doc) {
+        elements = [
+          doc.createElement('p'),
+          doc.createElement('div'),
+          doc.createElement('div'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('p'),
+          doc.createElement('div'),
+          doc.createElement('address'),
+          doc.createElement('div'),
+          doc.createElement('div'),
+          doc.createElement('div'),
+          doc.createElement('p'),
+          doc.createElement('div'),
+          doc.createElement('p')
+        ];
+        for (var i = 0; i < elements.length; i += 1)
+          doc.body.appendChild(elements[i]);
+      };
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":first-of-type");
+        var values = [1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0];
+        for (var i = 0; i < elements.length; i += 1)
+          expect(elements[i], values[i] ? match : 0, "part 1:" + i);
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":last-of-type");
+        var values = [0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1];
+        for (var i = 0; i < elements.length; i += 1)
+          expect(elements[i], values[i] ? match : 0, "part 2:" + i);
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":only-of-type");
+        var values = [0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0];
+        for (var i = 0; i < elements.length; i += 1)
+          expect(elements[i], values[i] ? match : 0, "part 3:" + i);
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":nth-of-type(3n-1)");
+        var values = [0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0];
+        for (var i = 0; i < elements.length; i += 1)
+          expect(elements[i], values[i] ? match : 0, "part 4:" + i);
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":nth-of-type(3n+1)");
+        var values = [1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0];
+        for (var i = 0; i < elements.length; i += 1)
+          expect(elements[i], values[i] ? match : 0, "part 5:" + i);
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":nth-last-of-type(2n)");
+        var values = [1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0];
+        for (var i = 0; i < elements.length; i += 1)
+          expect(elements[i], values[i] ? match : 0, "part 6:" + i);
+      });
+      selectorTest(function (doc, add, expect) {
+        builder(doc);
+        var match = add(":nth-last-of-type(-5n+3)");
+        var values;
+        values = [0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0];
+        for (var i = 0; i < elements.length; i += 1)
+          expect(elements[i], values[i] ? match : 0, "part 7:" + i);
+        doc.body.appendChild(doc.createElement('blockquote'));
+        values = [0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0];
+        for (var i = 0; i < elements.length; i += 1)
+          expect(elements[i], values[i] ? match : 0, "part 8:" + i);
+        doc.body.appendChild(doc.createElement('div'));
+        values = [0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0];
+        for (var i = 0; i < elements.length; i += 1)
+          expect(elements[i], values[i] ? match : 0, "part 9:" + i);
+      });
+      return 3;
+    },
+    function () {
+      // test 41: :root, :not()
+      selectorTest(function (doc, add, expect) {
+        var match = add(":not(:root)");
+        var p = doc.createElement('p');
+        doc.body.appendChild(p);
+        expect(doc.documentElement, 0, "root was :not(:root)");
+        expect(doc.documentElement.childNodes[0], match,"head was not :not(:root)");
+        expect(doc.documentElement.childNodes[1], match,"body was not :not(:root)");
+        expect(doc.documentElement.childNodes[0].firstChild, match,"title was not :not(:root)");
+        expect(p, match,"p was not :not(:root)");
+      });
+      return 3;
+    },
+    function () {
+      // test 42: +, ~, >, and ' ' in dynamic situations
+      selectorTest(function (doc, add, expect) {
+        var div1 = doc.createElement('div');
+        div1.id = "div1";
+        doc.body.appendChild(div1);
+        var div2 = doc.createElement('div');
+        doc.body.appendChild(div2);
+        var div3 = doc.createElement('div');
+        doc.body.appendChild(div3);
+        var div31 = doc.createElement('div');
+        div3.appendChild(div31);
+        var div311 = doc.createElement('div');
+        div31.appendChild(div311);
+        var div3111 = doc.createElement('div');
+        div311.appendChild(div3111);
+        var match = add("#div1 ~ div div + div > div");
+        expect(div1, 0, "failure 1");
+        expect(div2, 0, "failure 2");
+        expect(div3, 0, "failure 3");
+        expect(div31, 0, "failure 4");
+        expect(div311, 0, "failure 5");
+        expect(div3111, 0, "failure 6");
+        var div310 = doc.createElement('div');
+        div31.insertBefore(div310, div311);
+        expect(div1, 0, "failure 7");
+        expect(div2, 0, "failure 8");
+        expect(div3, 0, "failure 9");
+        expect(div31, 0, "failure 10");
+        expect(div310, 0, "failure 11");
+        expect(div311, 0, "failure 12");
+        expect(div3111, match, "rule did not start matching after change");
+      });
+      selectorTest(function (doc, add, expect) {
+        var div1 = doc.createElement('div');
+        div1.id = "div1";
+        doc.body.appendChild(div1);
+        var div2 = doc.createElement('div');
+        div1.appendChild(div2);
+        var div3 = doc.createElement('div');
+        div2.appendChild(div3);
+        var div4 = doc.createElement('div');
+        div3.appendChild(div4);
+        var div5 = doc.createElement('div');
+        div4.appendChild(div5);
+        var div6 = doc.createElement('div');
+        div5.appendChild(div6);
+        var match = add("#div1 > div div > div");
+        expect(div1, 0, "failure 14");
+        expect(div2, 0, "failure 15");
+        expect(div3, 0, "failure 16");
+        expect(div4, match, "failure 17");
+        expect(div5, match, "failure 18");
+        expect(div6, match, "failure 19");
+        var p34 = doc.createElement('p');
+        div3.insertBefore(p34, div4);
+        p34.insertBefore(div4, null);
+        expect(div1, 0, "failure 20");
+        expect(div2, 0, "failure 21");
+        expect(div3, 0, "failure 22");
+        expect(p34, 0, "failure 23");
+        expect(div4, 0, "failure 24");
+        expect(div5, match, "failure 25");
+        expect(div6, match, "failure 26");
+      });
+      selectorTest(function (doc, add, expect) {
+        var div1 = doc.createElement('div');
+        div1.id = "div1";
+        doc.body.appendChild(div1);
+        var div2 = doc.createElement('div');
+        div1.appendChild(div2);
+        var div3 = doc.createElement('div');
+        div2.appendChild(div3);
+        var div4 = doc.createElement('div');
+        div3.appendChild(div4);
+        var div5 = doc.createElement('div');
+        div4.appendChild(div5);
+        var div6 = doc.createElement('div');
+        div5.appendChild(div6);
+        var match = add("#div1 > div div > div");
+        expect(div1, 0, "failure 27");
+        expect(div2, 0, "failure 28");
+        expect(div3, 0, "failure 29");
+        expect(div4, match, "failure 30");
+        expect(div5, match, "failure 31");
+        expect(div6, match, "failure 32");
+        var p23 = doc.createElement('p');
+        div2.insertBefore(p23, div3);
+        p23.insertBefore(div3, null);
+        expect(div1, 0, "failure 33");
+        expect(div2, 0, "failure 34");
+        expect(div3, 0, "failure 35");
+        expect(p23, 0, "failure 36");
+        expect(div4, match, "failure 37");
+        expect(div5, match, "failure 38");
+        expect(div6, match, "failure 39");
+      });
+      return 3;
+    },
+    function () {
+      // test 43: :enabled, :disabled, :checked, etc
+      selectorTest(function (doc, add, expect) {
+        var input = doc.createElement('input');
+        input.type = 'checkbox';
+        doc.body.appendChild(input);
+        var neither = 0;
+        var both = add(":checked:enabled");
+        var checked = add(":checked");
+        var enabled = add(":enabled");
+        expect(doc.body, neither, "control failure");
+        expect(input, enabled, "input element didn't match :enabled");
+        input.click();
+        expect(input, both, "input element didn't match :checked");
+        input.disabled = true;
+        expect(input, checked, "failure 3");
+        input.checked = false;
+        expect(input, neither, "failure 4");
+        expect(doc.body, neither, "failure 5");
+      });
+      selectorTest(function (doc, add, expect) {
+        var input1 = doc.createElement('input');
+        input1.type = 'radio';
+        input1.name = 'radio';
+        doc.body.appendChild(input1);
+        var input2 = doc.createElement('input');
+        input2.type = 'radio';
+        input2.name = 'radio';
+        doc.body.appendChild(input2);
+        var checked = add(":checked");
+        expect(input1, 0, "failure 6");
+        expect(input2, 0, "failure 7");
+        input2.click();
+        expect(input1, 0, "failure 6");
+        expect(input2, checked, "failure 7");
+        input1.checked = true;
+        expect(input1, checked, "failure 8");
+        expect(input2, 0, "failure 9");
+        input2.setAttribute("checked", "checked"); // sets defaultChecked, doesn't change actual state
+        expect(input1, checked, "failure 10");
+        expect(input2, 0, "failure 11");
+        input1.type = "text";
+        expect(input1, 0, "text field matched :checked");
+      });
+      selectorTest(function (doc, add, expect) {
+        var input = doc.createElement('input');
+        input.type = 'button';
+        doc.body.appendChild(input);
+        var neither = 0;
+        var enabled = add(":enabled");
+        var disabled = add(":disabled");
+        add(":enabled:disabled");
+        expect(input, enabled, "failure 12");
+        input.disabled = true;
+        expect(input, disabled, "failure 13");
+        input.removeAttribute("disabled");
+        expect(input, enabled, "failure 14");
+        expect(doc.body, neither, "failure 15");
+      });
+      return 3;
+    },
+    function () {
+      // test 44: selectors without spaces before a "*"
+      selectorTest(function (doc, add, expect) {
+        doc.body.className = "test";
+        var p = doc.createElement('p');
+        p.className = "test";
+        doc.body.appendChild(p);
+        add("html*.test");
+        expect(doc.body, 0, "misparsed selectors");
+        expect(p, 0, "really misparsed selectors");
+      });
+      return 3;
+    },
+    function () {
+      // test 45: cssFloat and the style attribute
+      assert(!document.body.style.cssFloat, "body has floatation");
+      document.body.setAttribute("style", "float: right");
+      assertEquals(document.body.style.cssFloat, "right", "body doesn't have floatation");
+      document.body.setAttribute("style", "float: none");
+      assertEquals(document.body.style.cssFloat, "none", "body didn't lose floatation");
+      return 3;
+    },
+    function () {
+      // test 46: media queries
+      var doc = getTestDocument();
+      var style = doc.createElement('style');
+      style.setAttribute('type', 'text/css');
+      style.appendChild(doc.createTextNode('@media all and (min-color: 0) { #a { text-transform: uppercase; } }'));                         // matches
+      style.appendChild(doc.createTextNode('@media not all and (min-color: 0) { #b { text-transform: uppercase; } }'));
+      style.appendChild(doc.createTextNode('@media only all and (min-color: 0) { #c { text-transform: uppercase; } }'));                    // matches
+      style.appendChild(doc.createTextNode('@media (bogus) { #d { text-transform: uppercase; } }'));
+      style.appendChild(doc.createTextNode('@media all and (bogus) { #e { text-transform: uppercase; } }'));
+      style.appendChild(doc.createTextNode('@media not all and (bogus) { #f { text-transform: uppercase; } }'));                         // commentd out but should not match
+      style.appendChild(doc.createTextNode('@media only all and (bogus) { #g { text-transform: uppercase; } }'));
+      style.appendChild(doc.createTextNode('@media (bogus), all { #h { text-transform: uppercase; } }'));                                   // matches
+      style.appendChild(doc.createTextNode('@media all and (bogus), all { #i { text-transform: uppercase; } }'));                           // matches
+      style.appendChild(doc.createTextNode('@media not all and (bogus), all { #j { text-transform: uppercase; } }'));                       // matches
+      style.appendChild(doc.createTextNode('@media only all and (bogus), all { #k { text-transform: uppercase; } }'));                      // matches
+      style.appendChild(doc.createTextNode('@media all, (bogus) { #l { text-transform: uppercase; } }'));                                   // matches
+      style.appendChild(doc.createTextNode('@media all, all and (bogus) { #m { text-transform: uppercase; } }'));                           // matches
+      style.appendChild(doc.createTextNode('@media all, not all and (bogus) { #n { text-transform: uppercase; } }'));                       // matches
+      style.appendChild(doc.createTextNode('@media all, only all and (bogus) { #o { text-transform: uppercase; } }'));                      // matches
+      style.appendChild(doc.createTextNode('@media all and color { #p { text-transform: uppercase; } }'));
+      style.appendChild(doc.createTextNode('@media all and min-color: 0 { #q { text-transform: uppercase; } }'));
+      style.appendChild(doc.createTextNode('@media all, all and color { #r { text-transform: uppercase; } }'));                          // commented out but should match
+      style.appendChild(doc.createTextNode('@media all, all and min-color: 0 { #s { text-transform: uppercase; } }'));                   // commented out but should match
+      style.appendChild(doc.createTextNode('@media all and min-color: 0, all { #t { text-transform: uppercase; } }'));                   // commented out but should match
+      style.appendChild(doc.createTextNode('@media (max-color: 0) and (max-monochrome: 0) { #u { text-transform: uppercase; } }'));
+      style.appendChild(doc.createTextNode('@media (min-color: 1), (min-monochrome: 1) { #v { text-transform: uppercase; } }'));            // matches
+      style.appendChild(doc.createTextNode('@media all and (min-color: 0) and (min-monochrome: 0) { #w { text-transform: uppercase; } }')); // matches
+      style.appendChild(doc.createTextNode('@media not all and (min-color: 1), not all and (min-monochrome: 1) { #x { text-transform: uppercase; } }')); // matches
+      style.appendChild(doc.createTextNode('@media all and (min-height: 1em) and (min-width: 1em) { #y1 { text-transform: uppercase; } }'));
+      style.appendChild(doc.createTextNode('@media all and (max-height: 1em) and (min-width: 1em) { #y2 { text-transform: uppercase; } }'));
+      style.appendChild(doc.createTextNode('@media all and (min-height: 1em) and (max-width: 1em) { #y3 { text-transform: uppercase; } }'));
+      style.appendChild(doc.createTextNode('@media all and (max-height: 1em) and (max-width: 1em) { #y4 { text-transform: uppercase; } }')); // matches
+      doc.getElementsByTagName('head')[0].appendChild(style);
+      var names = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y1', 'y2', 'y3', 'y4'];
+      for (var i in names) {
+        var p = doc.createElement('p');
+        p.id = names[i];
+        doc.body.appendChild(p);
+      }
+      var count = 0;
+      var check = function (c, e) {
+        count += 1;
+        var p = doc.getElementById(c);
+        assertEquals(doc.defaultView.getComputedStyle(p, '').textTransform, e ? 'uppercase' : 'none', "case " + c + " failed (index " + count + ")");
+      }
+      check('a', true); // 1
+      check('b', false);
+      check('c', true);
+      check('d', false);
+      check('e', false);
+/* COMMENTED OUT BECAUSE THE CSSWG KEEP CHANGING THE RIGHT ANSWER FOR THIS CASE
+ *      check('f', false);
+ */
+      check('g', false);
+      check('h', true);
+      check('i', true);
+      check('j', true); // 10
+      check('k', true);
+      check('l', true);
+      check('m', true);
+      check('n', true);
+      check('o', true);
+      check('p', false);
+      check('q', false);
+/* COMMENTED OUT BECAUSE THE CSSWG KEEP CHANGING THE RIGHT ANSWER FOR THESE TOO APPARENTLY
+ *      check('r', true);
+ *      check('s', true);
+ *      check('t', true); // 20
+ */
+      check('u', false);
+      check('v', true);
+      check('w', true);
+      check('x', true);
+      // here the viewport is 0x0
+      check('y1', false); // 25
+      check('y2', false);
+      check('y3', false);
+      check('y4', true);
+      document.getElementById("selectors").setAttribute("style", "height: 100px; width: 100px");
+      // now the viewport is more than 1em by 1em
+      check('y1', true); // 29
+      check('y2', false);
+      check('y3', false);
+      check('y4', false);
+      document.getElementById("selectors").removeAttribute("style");
+      // here the viewport is 0x0 again
+      check('y1', false); // 33
+      check('y2', false);
+      check('y3', false);
+      check('y4', true);
+      return 3;
+    },
+    function () {
+      // test 47: 'cursor' and CSS3 values
+      var doc = getTestDocument();
+      var style = doc.createElement('style');
+      style.setAttribute('type', 'text/css');
+      var cursors = ['auto', 'default', 'none', 'context-menu', 'help', 'pointer', 'progress', 'wait', 'cell', 'crosshair', 'text', 'vertical-text', 'alias', 'copy', 'move', 'no-drop', 'not-allowed', 'e-resize', 'n-resize', 'ne-resize', 'nw-resize', 's-resize', 'se-resize', 'sw-resize', 'w-resize', 'ew-resize', 'ns-resize', 'nesw-resize', 'nwse-resize', 'col-resize', 'row-resize', 'all-scroll'];
+      for (var i in cursors) {
+        var c = cursors[i];
+        style.appendChild(doc.createTextNode('#' + c + ' { cursor: ' + c + '; }'));
+      }
+      style.appendChild(doc.createTextNode('#bogus { cursor: bogus; }'));
+      doc.body.previousSibling.appendChild(style);
+      doc.body.id = "bogus";
+      assertEquals(doc.defaultView.getComputedStyle(doc.body, '').cursor, "auto", "control failed");
+      for (var i in cursors) {
+        var c = cursors[i];
+        doc.body.id = c;
+        assertEquals(doc.defaultView.getComputedStyle(doc.body, '').cursor, c, "cursor " + c + " not supported");
+      }
+      return 3;
+    },
+    function () {
+      // test 48: :link and :visited
+      var iframe = document.getElementById("selectors");
+      var number = (new Date()).valueOf();
+      var a = document.createElement('a');
+      a.appendChild(document.createTextNode('YOU SHOULD NOT SEE THIS AT ALL')); // changed text when fixing http://dbaron.org/mozilla/visited-privacy
+      a.setAttribute('id', 'linktest');
+      a.setAttribute('class', 'pending');
+      a.setAttribute('href', iframe.getAttribute('src') + "?" + number);
+      document.getElementsByTagName('map')[0].appendChild(a);
+      iframe.setAttribute("onload", "document.getElementById('linktest').removeAttribute('class')");
+      iframe.src = a.getAttribute("href");
+      return 3;
+    },
+
+    // bucket 4: HTML and the DOM
+    // Tables
+    function () {
+      // test 49: basic table accessor ping test create*, delete*, and *
+      // where * is caption, tHead, tFoot.
+      var table = document.createElement('table');
+      assert(!table.caption, "initially: caption");
+      assert(table.tBodies, "initially: tBodies");
+      assertEquals(table.tBodies.length, 0, "initially: tBodies.length");
+      assert(table.rows, "initially: rows");
+      assertEquals(table.rows.length, 0, "initially: rows.length");
+      assert(!table.tFoot, "initially: tFoot");
+      assert(!table.tHead, "initially: tHead");
+      var caption = table.createCaption();
+      var thead = table.createTHead();
+      var tfoot = table.createTFoot();
+      assertEquals(table.caption, caption, "after creation: caption");
+      assert(table.tBodies, "after creation: tBodies");
+      assertEquals(table.tBodies.length, 0, "after creation: tBodies.length");
+      assert(table.rows, "after creation: rows");
+      assertEquals(table.rows.length, 0, "after creation: rows.length");
+      assertEquals(table.tFoot, tfoot, "after creation: tFoot");
+      assertEquals(table.tHead, thead, "after creation: tHead");
+      assertEquals(table.childNodes.length, 3, "after creation: childNodes.length");
+      table.caption = caption; // no-op
+      table.tHead = thead; // no-op
+      table.tFoot = tfoot; // no-op
+      assertEquals(table.caption, caption, "after setting: caption");
+      assert(table.tBodies, "after setting: tBodies");
+      assertEquals(table.tBodies.length, 0, "after setting: tBodies.length");
+      assert(table.rows, "after setting: rows");
+      assertEquals(table.rows.length, 0, "after setting: rows.length");
+      assertEquals(table.tFoot, tfoot, "after setting: tFoot");
+      assertEquals(table.tHead, thead, "after setting: tHead");
+      assertEquals(table.childNodes.length, 3, "after setting: childNodes.length");
+      table.deleteCaption();
+      table.deleteTHead();
+      table.deleteTFoot();
+      assert(!table.caption, "after deletion: caption");
+      assert(table.tBodies, "after deletion: tBodies");
+      assertEquals(table.tBodies.length, 0, "after deletion: tBodies.length");
+      assert(table.rows, "after deletion: rows");
+      assertEquals(table.rows.length, 0, "after deletion: rows.length");
+      assert(!table.tFoot, "after deletion: tFoot");
+      assert(!table.tHead, "after deletion: tHead");
+      assert(!table.hasChildNodes(), "after deletion: hasChildNodes()");
+      assertEquals(table.childNodes.length, 0, "after deletion: childNodes.length");
+      return 4;
+    },
+    function () {
+      // test 50: construct a table, and see if the table is as expected
+      var table = document.createElement('table');
+      table.appendChild(document.createElement('tbody'));
+      var tr1 = document.createElement('tr');
+      table.appendChild(tr1);
+      table.appendChild(document.createElement('caption'));
+      table.appendChild(document.createElement('thead'));
+      // <table><tbody/><tr/><caption/><thead/>
+      table.insertBefore(table.firstChild.nextSibling, null); // move the <tr/> to the end
+      // <table><tbody/><caption/><thead/><tr/>
+      table.replaceChild(table.firstChild, table.lastChild); // move the <tbody/> to the end and remove the <tr>
+      // <table><caption/><thead/><tbody/>
+      var tr2 = table.tBodies[0].insertRow(0);
+      // <table><caption/><thead/><tbody><tr/><\tbody>     (the '\' is to avoid validation errors)
+      assertEquals(table.tBodies[0].rows[0].rowIndex, 0, "rowIndex broken");
+      assertEquals(table.tBodies[0].rows[0].sectionRowIndex, 0, "sectionRowIndex broken");
+      assertEquals(table.childNodes.length, 3, "wrong number of children");
+      assert(table.caption, "caption broken");
+      assert(table.tHead, "tHead broken");
+      assert(!table.tFoot, "tFoot broken");
+      assertEquals(table.tBodies.length, 1, "wrong number of tBodies");
+      assertEquals(table.rows.length, 1, "wrong number of rows");
+      assert(!tr1.parentNode, "orphan row has unexpected parent");
+      assertEquals(table.caption, table.createCaption(), "caption creation failed");
+      assertEquals(table.tFoot, null, "table has unexpected footer");
+      assertEquals(table.tHead, table.createTHead(), "header creation failed");
+      assertEquals(table.createTFoot(), table.tFoot, "footer creation failed");
+      // either: <table><caption/><thead/><tbody><tr/><\tbody><tfoot/>
+      //     or: <table><caption/><thead/><tfoot/><tbody><tr/><\tbody>
+      table.tHead.appendChild(tr1);
+      // either: <table><caption/><thead><tr/><\thead><tbody><tr/><\tbody><tfoot/>
+      //     or: <table><caption/><thead><tr/><\thead><tfoot/><tbody><tr/><\tbody>
+      assertEquals(table.rows[0], table.tHead.firstChild, "top row not in expected position");
+      assertEquals(table.rows.length, 2, "wrong number of rows after appending one");
+      assertEquals(table.rows[1], table.tBodies[0].firstChild, "second row not in expected position");
+      return 4;
+    },
+    function () {
+      // test 51: test the ordering and creation of rows
+      var table = document.createElement('table');
+      var rows = [
+        document.createElement('tr'),    // 0: ends up first child of the tfoot
+        document.createElement('tr'),    // 1: goes at the end of the table
+        document.createElement('tr'),    // 2: becomes second child of thead
+        document.createElement('tr'),    // 3: becomes third child of the thead
+        document.createElement('tr'),    // 4: not in the table
+        table.insertRow(0),              // 5: not in the table
+        table.createTFoot().insertRow(0) // 6: ends up second in the tfoot
+      ];
+      rows[6].parentNode.appendChild(rows[0]);
+      table.appendChild(rows[1]);
+      table.insertBefore(document.createElement('thead'), table.firstChild);
+      table.firstChild.appendChild(rows[2]);
+      rows[2].parentNode.appendChild(rows[3]);
+      rows[4].appendChild(rows[5].parentNode);
+      table.insertRow(0);
+      table.tFoot.appendChild(rows[6]);
+      assertEquals(table.rows.length, 6, "wrong number of rows");
+      assertEquals(table.getElementsByTagName('tr').length, 6, "wrong number of tr elements");
+      assertEquals(table.childNodes.length, 3, "table has wrong number of children");
+      assertEquals(table.childNodes[0], table.tHead, "tHead isn't first");
+      assertEquals(table.getElementsByTagName('tr')[0], table.tHead.childNodes[0], "first tr isn't in tHead correctly");
+      assertEquals(table.getElementsByTagName('tr')[1], table.tHead.childNodes[1], "second tr isn't in tHead correctly");
+      assertEquals(table.getElementsByTagName('tr')[1], rows[2], "second tr is the wrong row");
+      assertEquals(table.getElementsByTagName('tr')[2], table.tHead.childNodes[2], "third tr isn't in tHead correctly");
+      assertEquals(table.getElementsByTagName('tr')[2], rows[3], "third tr is the wrong row");
+      assertEquals(table.childNodes[1], table.tFoot, "tFoot isn't second");
+      assertEquals(table.getElementsByTagName('tr')[3], table.tFoot.childNodes[0], "fourth tr isn't in tFoot correctly");
+      assertEquals(table.getElementsByTagName('tr')[3], rows[0], "fourth tr is the wrong row");
+      assertEquals(table.getElementsByTagName('tr')[4], table.tFoot.childNodes[1], "fifth tr isn't in tFoot correctly");
+      assertEquals(table.getElementsByTagName('tr')[4], rows[6], "fifth tr is the wrong row");
+      assertEquals(table.getElementsByTagName('tr')[5], table.childNodes[2], "sixth tr isn't in tFoot correctly");
+      assertEquals(table.getElementsByTagName('tr')[5], rows[1], "sixth tr is the wrong row");
+      assertEquals(table.tBodies.length, 0, "non-zero number of tBodies");
+      return 4;
+    },
+
+    // Forms
+    function () {
+      // test 52: <form> and .elements
+      test = document.getElementsByTagName('form')[0];
+      assert(test.elements !== test, "form.elements === form");
+      assert(test.elements !== test.getAttribute('elements'), "form element has an elements content attribute");
+      assertEquals(test.elements.length, 1, "form element has unexpected number of controls");
+      assertEquals(test.elements.length, test.length, "form element has inconsistent numbers of controls");
+      return 4;
+    },
+    function () {
+      // test 53: changing an <input> dynamically
+      var f = document.createElement('form');
+      var i = document.createElement('input');
+      i.name = 'first';
+      i.type = 'text';
+      i.value = 'test';
+      f.appendChild(i);
+      assertEquals(i.getAttribute('name'), 'first', "name attribute wrong");
+      assertEquals(i.name, 'first', "name property wrong");
+      assertEquals(i.getAttribute('type'), 'text', "type attribute wrong");
+      assertEquals(i.type, 'text', "type property wrong");
+      assert(!i.hasAttribute('value'), "value attribute wrong");
+      assertEquals(i.value, 'test', "value property wrong");
+      assertEquals(f.elements.length, 1, "form's elements array has wrong size");
+      assertEquals(f.elements[0], i, "form's element array doesn't have input control by index");
+      assertEquals(f.elements.first, i, "form's element array doesn't have input control by name");
+      assertEquals(f.elements.second, null, "form's element array has unexpected controls by name");
+      i.name = 'second';
+      i.type = 'password';
+      i.value = 'TEST';
+      assertEquals(i.getAttribute('name'), 'second', "name attribute wrong after change");
+      assertEquals(i.name, 'second', "name property wrong after change");
+      assertEquals(i.getAttribute('type'), 'password', "type attribute wrong after change");
+      assertEquals(i.type, 'password', "type property wrong after change");
+      assert(!i.hasAttribute('value'), "value attribute wrong after change");
+      assertEquals(i.value, 'TEST', "value property wrong after change");
+      assertEquals(f.elements.length, 1, "form's elements array has wrong size after change");
+      assertEquals(f.elements[0], i, "form's element array doesn't have input control by index after change");
+      assertEquals(f.elements.second, i, "form's element array doesn't have input control by name after change");
+      assertEquals(f.elements.first, null, "form's element array has unexpected controls by name after change");
+      return 4;
+    },
+    function () {
+      // test 54: changing a parsed <input>
+      var i = document.getElementsByTagName('input')[0];
+      // initial values
+      assertEquals(i.getAttribute('type'), 'HIDDEN', "input control's type content attribute was wrong");
+      assertEquals(i.type, 'hidden', "input control's type DOM attribute was wrong");
+      // change values
+      i.name = 'test';
+      assertEquals(i.parentNode.elements.test, i, "input control's form didn't update");
+      // check event handlers
+      i.parentNode.action = 'javascript:';
+      var called = false;
+      i.parentNode.onsubmit = function (arg) {
+        arg.preventDefault();
+        called = true;
+      };
+      i.type = 'submit';
+      i.click(); // synchronously dispatches a click event to the submit button, which submits the form, which calls onsubmit
+      assert(called, "click handler didn't dispatch properly");
+      i.type = 'hIdDeN';
+      // check numeric attributes
+      i.setAttribute('maxLength', '2');
+      var s = i.getAttribute('maxLength');
+      assert(s.match, "attribute is not a String");
+      assert(!s.MIN_VALUE, "attribute is a Number");
+      return 4;
+    },
+    function () {
+      // test 55: moved checkboxes should keep their state
+      var container = document.getElementsByTagName("iframe")[0];
+      var input1 = document.createElement('input');
+      container.appendChild(input1);
+      input1.type = "checkbox";
+      input1.checked = true;
+      assert(input1.checked, "checkbox not checked after being checked (inserted first)");
+      var input2 = document.createElement('input');
+      input2.type = "checkbox";
+      container.appendChild(input2);
+      input2.checked = true;
+      assert(input2.checked, "checkbox not checked after being checked (inserted after type set)");
+      var input3 = document.createElement('input');
+      input3.type = "checkbox";
+      input3.checked = true;
+      container.appendChild(input3);
+      assert(input3.checked, "checkbox not checked after being checked (inserted after being checked)");
+      var target = document.getElementsByTagName("iframe")[1];
+      target.appendChild(input1);
+      target.appendChild(input2);
+      target.appendChild(input3);
+      assert(input1.checked, "checkbox 1 not checked after being moved");
+      assert(input2.checked, "checkbox 2 not checked after being moved");
+      assert(input3.checked, "checkbox 3 not checked after being moved");
+      return 4;
+    },
+    function () {
+      // test 56: cloned radio buttons should keep their state
+      var form = document.getElementsByTagName("form")[0];
+      var input1 = document.createElement('input');
+      input1.type = "radio";
+      input1.name = "radioGroup1";
+      form.appendChild(input1);
+      var input2 = input1.cloneNode(true);
+      input1.parentNode.appendChild(input2);
+      input1.checked = true;
+      assert(form.elements.radioGroup1, "radio group absent");
+      assert(input1.checked, "first radio button not checked");
+      assert(!input2.checked, "second radio button checked");
+      input2.checked = true;
+      assert(!input1.checked, "first radio button checked");
+      assert(input2.checked, "second radio button not checked");
+      var input3 = document.createElement('input');
+      input3.type = "radio";
+      input3.name = "radioGroup2";
+      form.appendChild(input3);
+      assert(!input3.checked, "third radio button checked");
+      input3.checked = true;
+      assert(!input1.checked, "first radio button newly checked");
+      assert(input2.checked, "second radio button newly not checked");
+      assert(input3.checked, "third radio button not checked");
+      input1.checked = true;
+      assert(input1.checked, "first radio button ended up not checked");
+      assert(!input2.checked, "second radio button ended up checked");
+      assert(input3.checked, "third radio button ended up not checked");
+      input1.parentNode.removeChild(input1);
+      input2.parentNode.removeChild(input2);
+      input3.parentNode.removeChild(input3);
+      return 4;
+    },
+    function () {
+      // test 57: HTMLSelectElement.add()
+      var s = document.createElement('select');
+      var o = document.createElement('option');
+      s.add(o, null);
+      assert(s.firstChild === o, "add() didn't add to firstChild");
+      assertEquals(s.childNodes.length, 1, "add() didn't add to childNodes");
+      assert(s.childNodes[0] === o, "add() didn't add to childNodes correctly");
+      assertEquals(s.options.length, 1, "add() didn't add to options");
+      assert(s.options[0] === o, "add() didn't add to options correctly");
+      return 4;
+    },
+    function () {
+      // test 58: HTMLOptionElement.defaultSelected
+      var s = document.createElement('select');
+      var o1 = document.createElement('option');
+      var o2 = document.createElement('option');
+      o2.defaultSelected = true;
+      var o3 = document.createElement('option');
+      s.appendChild(o1);
+      s.appendChild(o2);
+      s.appendChild(o3);
+      assert(s.options[s.selectedIndex] === o2, "defaultSelected didn't take");
+      return 4;
+    },
+    function () {
+      // test 59: attributes of <button> elements
+      var button = document.createElement('button');
+      assertEquals(button.type, "submit", "<button> doesn't have type=submit");
+      button.setAttribute("type", "button");
+      assertEquals(button.type, "button", "<button type=button> doesn't have type=button");
+      button.removeAttribute("type");
+      assertEquals(button.type, "submit", "<button> doesn't have type=submit back");
+      button.setAttribute('value', 'apple');
+      button.appendChild(document.createTextNode('banana'));
+      assertEquals(button.value, 'apple', "wrong button value");
+      return 4;
+    },
+
+    // Misc DOM2 HTML
+    function () {
+      // test 60: className vs "class" vs attribute nodes
+      var span = document.getElementsByTagName('span')[0];
+      span.setAttribute('class', 'kittens');
+// COMMENTED OUT FOR 2011 UPDATE - turns out instead of dropping Attr entirely, as Acid3 originally expected, the API is just being refactored
+//      if (!span.getAttributeNode)
+//        return 4; // support for attribute nodes is optional in Acid3, because attribute nodes might be removed from DOM Core in the future.
+//      var attr = span.getAttributeNode('class');
+//      // however, if they're supported, they'd better work:
+//      assert(attr.specified, "attribute not specified");
+//      assertEquals(attr.value, 'kittens', "attribute value wrong");
+//      assertEquals(attr.name, 'class', "attribute name wrong");
+//      attr.value = 'ocelots';
+//      assertEquals(attr.value, 'ocelots', "attribute value wrong");
+//      assertEquals(span.className, 'ocelots', "setting attribute value failed to be reflected in className");
+      span.className = 'cats';
+//      assertEquals(attr.ownerElement.getAttribute('class'), 'cats', "setting attribute value failed to be reflected in getAttribute()");
+//      span.removeAttributeNode(attr);
+//      assert(attr.specified, "attribute not specified after removal");
+//      assert(!attr.ownerElement, "attribute still owned after removal");
+//      assert(!span.className, "element had class after removal");
+      return 4;
+    },
+    function () {
+      // test 61: className and the class attribute: space preservation
+      var p = document.createElement('p');
+      assert(!p.hasAttribute('class'), "element had attribute on creation");
+      p.setAttribute('class', ' te  st ');
+      assert(p.hasAttribute('class'), "element did not have attribute after setting");
+      assertEquals(p.getAttribute('class'), ' te  st ', "class attribute's value was wrong");
+      assertEquals(p.className, ' te  st ', "className was wrong");
+      p.className = p.className.replace(/ /g, '\n');
+      assert(p.hasAttribute('class'), "element did not have attribute after replacement");
+      assertEquals(p.getAttribute('class'), '\nte\n\nst\n', "class attribute's value was wrong after replacement");
+      assertEquals(p.className, '\nte\n\nst\n', "className was wrong after replacement");
+      p.className = '';
+      assert(p.hasAttribute('class'), "element lost attribute after being set to empty string");
+      assertEquals(p.getAttribute('class'), '', "class attribute's value was wrong after being emptied");
+      assertEquals(p.className, '', "className was wrong after being emptied");
+      return 4;
+    },
+    function () {
+      // test 62: check that DOM attributes and content attributes aren't equivalent
+      var test;
+      // <div class="">
+      test = document.getElementsByTagName('div')[0];
+      assertEquals(test.className, 'buckets', "buckets: className wrong");
+      assertEquals(test.getAttribute('class'), 'buckets', "buckets: class wrong");
+      assert(!test.hasAttribute('className'), "buckets: element has className attribute");
+      assert(test.className != test.getAttribute('className'), "buckets: className attribute equals className property");
+      assert(!('class' in test), "buckets: element has class property")
+      test['class'] = "oil";
+      assert(test.className != "oil", "buckets: class property affected className");
+      // <label for="">
+      test = document.createElement('label');
+      test.htmlFor = 'jars';
+      assertEquals(test.htmlFor, 'jars', "jars: htmlFor wrong");
+      assertEquals(test.getAttribute('for'), 'jars', "jars: for wrong");
+      assert(!test.hasAttribute('htmlFor'), "jars: element has htmlFor attribute");
+      assert(test.htmlFor != test.getAttribute('htmlFor'), "jars: htmlFor attribute equals htmlFor property");
+      test = document.createElement('label');
+      test.setAttribute('for', 'pots');
+      assertEquals(test.htmlFor, 'pots', "pots: htmlFor wrong");
+      assertEquals(test.getAttribute('for'), 'pots', "pots: for wrong");
+      assert(!test.hasAttribute('htmlFor'), "pots: element has htmlFor attribute");
+      assert(test.htmlFor != test.getAttribute('htmlFor'), "pots: htmlFor attribute equals htmlFor property");
+      assert(!('for' in test), "pots: element has for property");
+      test['for'] = "oil";
+      assert(test.htmlFor != "oil", "pots: for property affected htmlFor");
+      // <meta http-equiv="">
+      test = document.createElement('meta');
+      test.setAttribute('http-equiv', 'boxes');
+      assertEquals(test.httpEquiv, 'boxes', "boxes: httpEquiv wrong");
+      assertEquals(test.getAttribute('http-equiv'), 'boxes', "boxes: http-equiv wrong");
+      assert(!test.hasAttribute('httpEquiv'), "boxes: element has httpEquiv attribute");
+      assert(test.httpEquiv != test.getAttribute('httpEquiv'), "boxes: httpEquiv attribute equals httpEquiv property");
+      test = document.createElement('meta');
+      test.httpEquiv = 'cans';
+      assertEquals(test.httpEquiv, 'cans', "cans: httpEquiv wrong");
+      assertEquals(test.getAttribute('http-equiv'), 'cans', "cans: http-equiv wrong");
+      assert(!test.hasAttribute('httpEquiv'), "cans: element has httpEquiv attribute");
+      assert(test.httpEquiv != test.getAttribute('httpEquiv'), "cans: httpEquiv attribute equals httpEquiv property");
+      assert(!('http-equiv' in test), "cans: element has http-equiv property");
+      test['http-equiv'] = "oil";
+      assert(test.httpEquiv != "oil", "cans: http-equiv property affected httpEquiv");
+      return 4;
+    },
+    function () {
+      // test 63: attributes of the <area> element
+      var area = document.getElementsByTagName('area')[0];
+      assertEquals(area.getAttribute('href'), '', "wrong value for href=''");
+      assertEquals(area.getAttribute('shape'), 'rect', "wrong value for shape=''");
+      assertEquals(area.getAttribute('coords'), '2,2,4,4', "wrong value for coords=''");
+      assertEquals(area.getAttribute('alt'), '<\'>', "wrong value for alt=''");
+      return 4;
+    },
+    function () {
+      // test 64: more attribute tests
+      // attributes of the <object> element
+      var obj1 = document.createElement('object');
+      obj1.setAttribute('data', 'test.html');
+      var obj2 = document.createElement('object');
+      obj2.setAttribute('data', './test.html');
+      assertEquals(obj1.data, obj2.data, "object elements didn't resolve URIs correctly");
+      assert(obj1.data.match(/^http:/), "object.data isn't absolute");
+      obj1.appendChild(document.createElement('param'));
+      assertEquals(obj1.getElementsByTagName('param').length, 1, "object is missing its only child");
+      // non-existent attributes
+      var test = document.createElement('p');
+      assert(!('TWVvdywgbWV3Li4u' in test), "TWVvdywgbWV3Li4u unexpectedly found");
+      assertEquals(test.TWVvdywgbWV3Li4u, undefined, ".TWVvdywgbWV3Li4u wasn't undefined");
+      assertEquals(test['TWVvdywgbWV3Li4u'], undefined, "['TWVvdywgbWV3Li4u'] wasn't undefined");
+      test.setAttribute('TWVvdywgbWV3Li4u', 'woof');
+      assert(!('TWVvdywgbWV3Li4u' in test), "TWVvdywgbWV3Li4u unexpectedly found after setting");
+      assertEquals(test.TWVvdywgbWV3Li4u, undefined, ".TWVvdywgbWV3Li4u wasn't undefined after setting");
+      assertEquals(test['TWVvdywgbWV3Li4u'], undefined, "['TWVvdywgbWV3Li4u'] wasn't undefined after setting");
+      assertEquals(test.getAttribute('TWVvdywgbWV3Li4u'), 'woof', "TWVvdywgbWV3Li4u has wrong value after setting");
+      return 4;
+    },
+
+    // bucket 5: Tests from the Acid3 Competition
+    function () {
+      // test 65: bring in a couple of SVG files and some HTML files dynamically - preparation for later tests in this bucket
+      // NOTE FROM 2011 UPDATE: The svg.xml file still contains the SVG font, but it is no longer used
+      kungFuDeathGrip = document.createElement('p');
+      kungFuDeathGrip.className = 'removed';
+      var iframe, object;
+      // svg iframe
+      iframe = document.createElement('iframe');
+      iframe.onload = function () { kungFuDeathGrip.title += '1' };
+      iframe.src = "svg.xml";
+      kungFuDeathGrip.appendChild(iframe);
+      // object iframe
+      object = document.createElement('object');
+      object.onload = function () { kungFuDeathGrip.title += '2' };
+      object.data = "svg.xml";
+      kungFuDeathGrip.appendChild(object);
+      // xml iframe
+      iframe = document.createElement('iframe');
+      iframe.onload = function () { kungFuDeathGrip.title += '3' };
+      iframe.src = "empty.xml";
+      kungFuDeathGrip.appendChild(iframe);
+      // html iframe
+      iframe = document.createElement('iframe');
+      iframe.onload = function () { kungFuDeathGrip.title += '4' };
+      iframe.src = "empty.html";
+      kungFuDeathGrip.appendChild(iframe);
+      // html iframe
+      iframe = document.createElement('iframe');
+      iframe.onload = function () { kungFuDeathGrip.title += '5' };
+      iframe.src = "xhtml.1";
+      kungFuDeathGrip.appendChild(iframe);
+      // html iframe
+      iframe = document.createElement('iframe');
+      iframe.onload = function () { kungFuDeathGrip.title += '6' };
+      iframe.src = "xhtml.2";
+      kungFuDeathGrip.appendChild(iframe);
+      // html iframe
+      iframe = document.createElement('iframe');
+      iframe.onload = function () { kungFuDeathGrip.title += '7' };
+      iframe.src = "xhtml.3";
+      kungFuDeathGrip.appendChild(iframe);
+      // add the lot to the document
+      document.getElementsByTagName('map')[0].appendChild(kungFuDeathGrip);
+      return 5;
+    },
+    function () {
+      // test 66: localName on text nodes (and now other things), from Sylvain Pasche
+      assertEquals(document.createTextNode("test").localName, null, 'wrong localName for text node');
+      assertEquals(document.createComment("test").localName, null, 'wrong localName for comment node');
+      assertEquals(document.localName, null, 'wrong localName for document node');
+      return 5;
+    },
+    function () {
+// COMMENTED OUT IN NOV 2013 BECAUSE DOM SPEC REMOVED THIS FEATURE
+//       // test 67: removedNamedItemNS on missing attributes, from Sylvain Pasche
+//       var p = document.createElement("p");
+//       var msg = 'wrong exception raised';
+//       try {
+//         p.attributes.removeNamedItemNS("http://www.example.com/", "absent");
+//         msg = 'no exception raised';
+//       } catch (e) {
+//         if ('code' in e) {
+//           if (e.code == 8)
+//             msg = '';
+//           else
+//             msg += '; code = ' + e.code;
+//         }
+//       }
+//       assert(msg == '', "when calling removeNamedItemNS in a non existent attribute: " + msg);
+      return 5;
+    },
+    function () {
+      // test 68: UTF-16 surrogate pairs, from David Chan
+      //
+      // In The Unicode Standard 5.0, it is explicitly permitted to
+      // allow malformed UTF-16, that is, to leave the string alone.
+      // (http://www.unicode.org/versions/Unicode5.0.0):
+      //
+      // section 2.7: "...strings in ... ECMAScript are Unicode 16-bit
+      // strings, but are not necessarily well-formed UTF-16
+      // sequences.  In normal processing, it can be far more
+      // efficient to allow such strings to contain code unit
+      // sequences that are not well-formed UTF-16 -- that is,
+      // isolated surrogates"
+      //
+      // On the other hand, if the application wishes to ensure
+      // well-formed character sequences, it may not permit the
+      // malformed sequence and it must regard the first codepoint as
+      // an error:
+      //
+      // Section 3.2: "C10. When a process interprets a code sequence
+      // which purports to be in a Unicode character encoding form, it
+      // shall treat ill-formed code unit sequences as an error
+      // condition and shall not interpret such sequences as
+      // characters.
+      // [...]
+      // For example, in UTF-8 every code unit of the form 110....2
+      // must be followed by a code unit of the form 10......2. A
+      // sequence such as 110.....2 0.......2 is ill-formed and must
+      // never be generated. When faced with this ill-formed code unit
+      // sequence while transforming or interpreting text, a
+      // conformant process must treat the first code unit 110.....2
+      // as an illegally terminated code unit sequence~Wfor example,
+      // by signaling an error, filtering the code unit out, or
+      // representing the code unit with a marker such as U+FFFD
+      // replacement character."
+      //
+      // So it would be permitted to do any of the following:
+      // 1) Leave the string alone
+      // 2) Remove the unpaired surrogate
+      // 3) Replace the unpaired surrogate with U+FFFD
+      // 4) Throw an exception
+
+      try {
+        var unpaired = String.fromCharCode(0xd863); // half a surrogate pair
+        var before = unpaired + "text";
+        var elt = document.createElement("input");
+        elt.value = before;
+        var after = elt.value;
+      }
+      catch(ex) {
+        return 5; // Unpaired surrogate caused an exception - ok
+      }
+      if (after == before && before.length == 5)
+        return 5; // Unpaired surrogate kept - ok
+      if (after == "text")
+        return 5; // Unpaired surrogate removed - ok
+      var replacement = String.fromCharCode(0xfffd);
+      if (after == replacement + "text")
+        return 5; // Unpaired surrogate replaced - ok
+      fail("Unpaired surrogate handled wrongly (input was '" + before + "', output was '" + after + "')");
+    },
+    function () {
+      // test 69: check that the support files loaded -- preparation for the rest of the tests in this bucket
+      assert(!(kungFuDeathGrip == null), "kungFuDeathGrip was null");
+      assert(!(kungFuDeathGrip.title == null), "kungFuDeathGrip.title was null");
+      if (kungFuDeathGrip.title.length < 7)
+        return "retry";
+      assert(!(kungFuDeathGrip.firstChild == null), "kungFuDeathGrip.firstChild was null");
+      assert(!(kungFuDeathGrip.firstChild.contentDocument == null), "kungFuDeathGrip.firstChild.contentDocument was null");
+      assert(!(kungFuDeathGrip.firstChild.contentDocument.getElementsByTagName == null), "kungFuDeathGrip.firstChild.contentDocument.getElementsByTagName was null");
+      var t = kungFuDeathGrip.firstChild.contentDocument.getElementsByTagName('text')[0];
+      assert(!(t == null), "t was null");
+      assert(!(t.parentNode == null), "t.parentNode was null");
+      assert(!(t.parentNode.removeChild == null), "t.parentNode.removeChild was null");
+      t.parentNode.removeChild(t);
+      return 5;
+    },
+    function () {
+      // test 70: XML encoding test
+      // the third child in kungFuDeathGrip is an ISO-8859-1 document sent as UTF-8.
+      // q.v. XML 1.0, section 4.3.3 Character Encoding in Entities
+      // this only tests one of a large number of conditions that should cause fatal errors
+      var doc = kungFuDeathGrip.childNodes[2].contentDocument;
+      if (!doc)
+        return 5;
+      if (doc.documentElement.tagName != "root")
+        return 5;
+      if (doc.documentElement.getElementsByTagName('test').length < 1)
+        return 5;
+      fail("UTF-8 encoded XML document with invalid character did not have a well-formedness error");
+    },
+    function () {
+      // test 71: HTML parsing, from Simon Pieters and Anne van Kesteren
+      var doc = kungFuDeathGrip.childNodes[3].contentDocument;
+      assert(doc, "missing document for test");
+      try {
+        // siblings
+        doc.open();
+        doc.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"><title><\/title><span><\/span><script type=\"text/javascript\"><\/script>");
+        doc.close();
+        assertEquals(doc.childNodes.length, 2, "wrong number of children in #document (first test)");
+        assertEquals(doc.firstChild.name.toUpperCase(), "HTML", "name wrong (first test)"); // changed 2009-08-13 to add .toUpperCase() for HTML5 compat
+        assertEquals(doc.firstChild.publicId, "-//W3C//DTD HTML 4.0 Transitional//EN", "publicId wrong (first test)");
+        if ((doc.firstChild.systemId != null) && (doc.firstChild.systemId != ""))
+          fail("systemId wrong (first test)");
+        if (('internalSubset' in doc.firstChild) || doc.firstChild.internalSubset)
+          assertEquals(doc.firstChild.internalSubset, null, "internalSubset wrong (first test)");
+        assertEquals(doc.documentElement.childNodes.length, 2, "wrong number of children in HTML (first test)");
+        assertEquals(doc.documentElement.firstChild.nodeName, "HEAD", "misplaced HEAD element (first test)");
+        assertEquals(doc.documentElement.firstChild.childNodes.length, 1, "wrong number of children in HEAD (first test)");
+        assertEquals(doc.documentElement.firstChild.firstChild.tagName, "TITLE", "misplaced TITLE element (first test)");
+        assertEquals(doc.documentElement.lastChild.nodeName, "BODY", "misplaced BODY element (first test)");
+        assertEquals(doc.documentElement.lastChild.childNodes.length, 2, "wrong number of children in BODY (first test)");
+        assertEquals(doc.documentElement.lastChild.firstChild.tagName, "SPAN", "misplaced SPAN element (first test)");
+        assertEquals(doc.documentElement.lastChild.lastChild.tagName, "SCRIPT", "misplaced SCRIPT element (first test)");
+        // parent/child
+        doc.open();
+        doc.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"><title><\/title><span><script type=\"text/javascript\"><\/script><\/span>");
+        doc.close();
+        assertEquals(doc.childNodes.length, 2, "wrong number of children in #document (second test)");
+        assertEquals(doc.firstChild.name.toUpperCase(), "HTML", "name wrong (second test)"); // changed 2009-08-13 to add .toUpperCase() for HTML5 compat
+        assertEquals(doc.firstChild.publicId, "-//W3C//DTD HTML 4.01 Transitional//EN", "publicId wrong (second test)");
+        assertEquals(doc.firstChild.systemId, "http://www.w3.org/TR/html4/loose.dtd", "systemId wrong (second test)");
+        if (('internalSubset' in doc.firstChild) || doc.firstChild.internalSubset)
+          assertEquals(doc.firstChild.internalSubset, null, "internalSubset wrong (second test)");
+        assertEquals(doc.documentElement.childNodes.length, 2, "wrong number of children in HTML (second test)");
+        assertEquals(doc.documentElement.firstChild.nodeName, "HEAD", "misplaced HEAD element (second test)");
+        assertEquals(doc.documentElement.firstChild.childNodes.length, 1, "wrong number of children in HEAD (second test)");
+        assertEquals(doc.documentElement.firstChild.firstChild.tagName, "TITLE", "misplaced TITLE element (second test)");
+        assertEquals(doc.documentElement.lastChild.nodeName, "BODY", "misplaced BODY element (second test)");
+        assertEquals(doc.documentElement.lastChild.childNodes.length, 1, "wrong number of children in BODY (second test)");
+        assertEquals(doc.documentElement.lastChild.firstChild.tagName, "SPAN", "misplaced SPAN element (second test)");
+        assertEquals(doc.documentElement.lastChild.firstChild.firstChild.tagName, "SCRIPT", "misplaced SCRIPT element (second test)");
+      } finally {
+        // prepare the file for the next test
+        doc.open();
+        doc.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"><head><title><\/title><style type=\"text/css\">img { height: 10px; }<\/style><body><p><img src=\"data:image/gif;base64,R0lGODlhAQABAID%2FAMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw%3D%3D\" alt=\"\">");
+        doc.close();
+      }
+      return 5;
+    },
+    function () {
+      // test 72: dynamic modification of <style> blocks' text nodes, from Jonas Sicking and Garret Smith
+      var doc = kungFuDeathGrip.childNodes[3].contentDocument;
+      assert(doc, "missing document for test");
+      assert(doc.images[0], "prerequisite failed: no image");
+      assertEquals(doc.images[0].height, 10, "prerequisite failed: style didn't affect image");
+      doc.styleSheets[0].ownerNode.firstChild.data = "img { height: 20px; }";
+      assertEquals(doc.images[0].height, 20, "change failed to take effect");
+      doc.styleSheets[0].ownerNode.appendChild(doc.createTextNode("img { height: 30px; }"));
+      assertEquals(doc.images[0].height, 30, "append failed to take effect");
+      var rules = doc.styleSheets[0].cssRules; // "All CSS objects in the DOM are "live"" says section 2.1, Overview of the DOM Level 2 CSS Interfaces
+      doc.styleSheets[0].insertRule("img { height: 40px; }", 2);
+      assertEquals(doc.images[0].height, 40, "insertRule failed to take effect");
+      assertEquals(doc.styleSheets[0].cssRules.length, 3, "count of rules is wrong");
+      assertEquals(rules.length, 3, "cssRules isn't live");
+      // while we're at it, check some other things on doc.styleSheets:
+      assert(doc.styleSheets[0].href === null, "internal stylesheet had a URI: " + doc.styleSheets[0].href);
+      assert(document.styleSheets[0].href === null, "internal acid3 stylesheet had a URI: " + document.styleSheets[0].href);
+      return 5;
+    },
+    function () {
+      // test 73: nested events, from Jonas Sicking
+      var doc = kungFuDeathGrip.childNodes[3].contentDocument;
+      // implied events
+      var up = 0;
+      var down = 0;
+      var button = doc.createElement("button");
+      button.type = "button";
+      button.onclick = function () { up += 1; if (up < 10) button.click(); down += up; }; // not called
+      button.addEventListener('test', function () { up += 1; var e = doc.createEvent("HTMLEvents"); e.initEvent('test', false, false); if (up < 20) button.dispatchEvent(e); down += up; }, false);
+      var evt = doc.createEvent("HTMLEvents");
+      evt.initEvent('test', false, false);
+      button.dispatchEvent(evt);
+      assertEquals(up, 20, "test event handler called the wrong number of times");
+      assertEquals(down, 400, "test event handler called in the wrong order");
+      return 5;
+    },
+    function () {
+      // test 74: check getSVGDocument(), from Erik Dahlstrom
+      // GetSVGDocument[6]: "In the case where an SVG document is
+      // embedded by reference, such as when an XHTML document has an
+      // 'object' element whose href (or equivalent) attribute
+      // references an SVG document (i.e., a document whose MIME type
+      // is "image/svg+xml" and whose root element is thus an 'svg'
+      // element), the SVG user agent is required to implement the
+      // GetSVGDocument interface for the element which references the
+      // SVG document (e.g., the HTML 'object' or comparable
+      // referencing elements)."
+      //
+      // [6] http://www.w3.org/TR/SVG11/struct.html#InterfaceGetSVGDocument
+      //
+      // iframe
+      var iframe = kungFuDeathGrip.childNodes[0];
+      assert(iframe, "Failed finding svg iframe.");
+      assert(iframe.contentDocument, "contentDocument failed for <iframe> referencing an svg document.");
+      if (!iframe.getSVGDocument)
+        fail("getSVGDocument missing on <iframe> element.");
+      assert(iframe.getSVGDocument(), "getSVGDocument failed for <iframe> referencing an svg document.");
+      assert(iframe.getSVGDocument() == iframe.contentDocument, "Mismatch between getSVGDocument and contentDocument #1.");
+      // object
+      var object = kungFuDeathGrip.childNodes[1];
+      assert(object, "Failed finding svg object.");
+      assert(object.contentDocument, "contentDocument failed for <object> referencing an svg document.");
+      if (!object.getSVGDocument)
+        fail("getSVGDocument missing on <object> element.");
+      assert(object.getSVGDocument(), "getSVGDocument failed for <object> referencing an svg document.");
+      assert(object.getSVGDocument() == object.contentDocument, "Mismatch between getSVGDocument and contentDocument #2.");
+      return 5;
+    },
+    function () {
+// PARTS COMMENTED OUT FOR 2011 UPDATE - SVG Fonts, SVG SMIL animation, and XLink have met with some implementor malaise even amongst those that shipped them
+// This affects tests 75 to 79
+//      // test 75: SMIL in SVG, from Erik Dahlstrom
+//      //
+//      // The test begins by creating a few elements, among those is a
+//      // <set> element.  This element is prevented from running by
+//      // setting begin="indefinite", which means that the animation
+//      // doesn't start until the 'beginElement' DOM method is called
+//      // on the <set> element. The animation is a simple animation
+//      // that sets the value of the width attribute to 0. The duration
+//      // of the animation is 'indefinite' which means that the value
+//      // will stay 0 indefinitely. The target of the animation is the
+//      // 'width' attribute of the <rect> element that is the parent of
+//      // the <set> element. When 'width' is 0 the rect is not rendered
+//      // according to the spec[7].
+//      //
+//      // Some properties of the SVGAnimatedLength[2] and SVGLength[8]
+//      // are also inspected. Before the animation starts both baseVal
+//      // and animVal contain the same values[2]. Then the animation is
+//      // started by calling the beginElement method[9]. To make sure
+//      // that time passes between the triggering of the animation and
+//      // the time that the values are read out (in test #66), the
+//      // current time is set to 1000 seconds using the setCurrentTime
+//      // method[10].
+//      //
+//      // [2] http://www.w3.org/TR/SVG11/types.html#InterfaceSVGAnimatedLength
+//      // [7] http://www.w3.org/TR/SVG11/shapes.html#RectElement
+//      // [8] http://www.w3.org/TR/SVG11/types.html#InterfaceSVGLength
+//      // [9] http://www.w3.org/TR/SVG11/animate.html#DOMInterfaces
+//      // [10] http://www.w3.org/TR/SVG11/struct.html#InterfaceSVGSVGElement
+//
+      var svgns = "http://www.w3.org/2000/svg";
+      var svgdoc = kungFuDeathGrip.firstChild.contentDocument;
+      assert(svgdoc, "contentDocument failed on <iframe> for svg document.");
+      var svg = svgdoc.documentElement;
+      var rect = svgdoc.createElementNS(svgns, "rect");
+      rect.setAttribute("fill", "red");
+      rect.setAttribute("width", "100");
+      rect.setAttribute("height", "100");
+      rect.setAttribute("id", "rect");
+//      var anim = svgdoc.createElementNS(svgns, "set");
+//      anim.setAttribute("begin", "indefinite");
+//      anim.setAttribute("to", "0");
+//      anim.setAttribute("attributeName", "width");
+//      anim.setAttribute("dur", "indefinite");
+//      anim.setAttribute("fill", "freeze");
+//      rect.appendChild(anim);
+      svg.appendChild(rect);
+      assert(rect.width, "SVG DOM interface SVGRectElement not supported.");
+//      assert(rect.width.baseVal, "SVG DOM base type SVGAnimatedLength not supported.");
+//      assert(rect.width.animVal, "SVG DOM base type SVGAnimatedLength not supported.");
+//      assertEquals(SVGLength.SVG_LENGTHTYPE_NUMBER, 1, "Incorrect SVGLength.SVG_LENGTHTYPE_NUMBER constant value.");
+//      assertEquals(rect.width.baseVal.unitType, SVGLength.SVG_LENGTHTYPE_NUMBER, "Incorrect unitType on width attribute.");
+      assertEquals(rect.getAttribute("width"), "100", "Incorrect value from getAttribute.");
+//      assertEquals(rect.width.baseVal.valueInSpecifiedUnits, 100, "Incorrect valueInSpecifiedUnits value.");
+//      assertEquals(rect.width.baseVal.value, 100, "Incorrect baseVal value before animation.");
+//      assertEquals(rect.width.animVal.value, 100, "Incorrect animVal value before animation.");
+//      anim.beginElement();
+//      assertEquals(rect.width.baseVal.value, 100, "Incorrect baseVal value after starting animation.");
+//      svg.setCurrentTime(1000); // setting 1 second to make sure that time != 0s when we check the animVal value
+//      // the animation is then tested in the next test
+      return 5;
+    },
+    function () {
+//      // test 76: SMIL in SVG, part 2, from Erik Dahlstrom
+//      //
+//      // About animVal[2]: "If the given attribute or property is
+//      // being animated, contains the current animated value of the
+//      // attribute or property, and both the object itself and its
+//      // contents are readonly. If the given attribute or property is
+//      // not currently being animated, contains the same value as
+//      // 'baseVal'."
+//      //
+//      // Since the duration of the animation is indefinite the value
+//      // is still being animated at the time it's queried. Now since
+//      // the 'width' attribute was animated from its original value of
+//      // "100" to the new value of "0" the animVal property must
+//      // contain the value 0.
+//      //
+//      // [2] http://www.w3.org/TR/SVG11/types.html#InterfaceSVGAnimatedLength
+//
+      var svgdoc = kungFuDeathGrip.firstChild.contentDocument;
+      assert(svgdoc, "contentDocument failed on <object> for svg document.");
+      var rect = svgdoc.getElementById("rect");
+      assert(rect, "Failed to find <rect> element in svg document.");
+//      assertEquals(rect.width.animVal.value, 0, "Incorrect animVal value after svg animation.");
+      return 5;
+    },
+    function () {
+//      // test 77: external SVG fonts, from Erik Dahlstrom
+//      //
+//      // SVGFonts are described here[3], and the relevant DOM methods
+//      // used in the test are defined here[4].
+//      //
+//      // Note that in order to be more predictable the svg should be
+//      // visible, so that clause "For non-rendering environments, the
+//      // user agent shall make reasonable assumptions about glyph
+//      // metrics." doesn't influence the results. We use 'opacity:0'
+//      // to hide the SVG, but arguably it's still a "rendering
+//      // environment".
+//      //
+//      // The font-size 4000 was chosen because that matches the
+//      // unitsPerEm value in the svgfont, which makes it easy to check
+//      // the glyph advances since they will then be exactly what was
+//      // specified in the svgfont.
+//      //
+//      // [3] http://www.w3.org/TR/SVG11/fonts.html
+//      // [4] http://www.w3.org/TR/SVG11/text.html#InterfaceSVGTextContentElement
+//
+      var svgns = "http://www.w3.org/2000/svg";
+//      var xlinkns = "http://www.w3.org/1999/xlink";
+      var svgdoc = kungFuDeathGrip.firstChild.contentDocument;
+      assert(svgdoc, "contentDocument failed on <object> for svg document.");
+      var svg = svgdoc.documentElement;
+      var text = svgdoc.createElementNS(svgns, "text");
+      text.setAttribute("y", "1em");
+      text.setAttribute("font-size", "4000");
+      text.setAttribute("font-family", "ACID3svgfont");
+      var textContent = svgdoc.createTextNode("abc");
+      text.appendChild(textContent);
+      svg.appendChild(text);
+      // The font-size 4000 was chosen because that matches the unitsPerEm value in the svgfont,
+      // which makes it easy to check the glyph advances since they will then be exactly what was specified in the svgfont.
+      assert(text.getNumberOfChars, "SVGTextContentElement.getNumberOfChars() not supported.");
+      assertEquals(text.getNumberOfChars(), 3, "getNumberOfChars returned incorrect string length.");
+//      assertEquals(text.getComputedTextLength(), 4711+42+23, "getComputedTextLength failed.");
+//      assertEquals(text.getSubStringLength(0,1), 42, "getSubStringLength #1 failed.");
+//      assertEquals(text.getSubStringLength(0,2), 42+23, "getSubStringLength #2 failed.");
+//      assertEquals(text.getSubStringLength(1,1), 23, "getSubStringLength #3 failed.");
+//      assertEquals(text.getSubStringLength(1,0), 0, "getSubStringLength #4 failed.");
+///* COMMENTED OUT BECAUSE SVGWG KEEPS CHANGING THIS
+// *     var code = -1000;
+// *     try {
+// *       var sl = text.getSubStringLength(1,3);
+// *     } catch(e) {
+// *       code = e.code;
+// *     }
+// *     assertEquals(code, DOMException.INDEX_SIZE_ERR, "getSubStringLength #1 didn't throw exception.");
+// *     code = -1000;
+// *     try {
+// *       var sl = text.getSubStringLength(0,4);
+// *     } catch(e) {
+// *       code = e.code;
+// *     }
+// *     assertEquals(code, DOMException.INDEX_SIZE_ERR, "getSubStringLength #2 didn't throw exception.");
+// *     code = -1000;
+// *     try {
+// *       var sl = text.getSubStringLength(3,0);
+// *     } catch(e) {
+// *       code = e.code;
+// *     }
+// *     assertEquals(code, DOMException.INDEX_SIZE_ERR, "getSubStringLength #3 didn't throw exception.");
+// */
+//      code = -1000;
+//      try {
+//        var sl = text.getSubStringLength(-17,20);
+//      } catch(e) {
+//        code = 0; // negative values might throw native exception since the api accepts only unsigned values
+//      }
+//      assert(code == 0, "getSubStringLength #4 didn't throw exception.");
+//      assertEquals(text.getStartPositionOfChar(0).x, 0, "getStartPositionOfChar(0).x returned invalid value.");
+//      assertEquals(text.getStartPositionOfChar(1).x, 42, "getStartPositionOfChar(1).x returned invalid value.");
+//      assertEquals(text.getStartPositionOfChar(2).x, 42+23, "getStartPositionOfChar(2).x returned invalid value.");
+//      assertEquals(text.getStartPositionOfChar(0).y, 4000, "getStartPositionOfChar(0).y returned invalid value.");
+//      code = -1000;
+//      try {
+//        var val = text.getStartPositionOfChar(-1);
+//      } catch(e) {
+//        code = 0; // negative values might throw native exception since the api accepts only unsigned values
+//      }
+//      assert(code == 0, "getStartPositionOfChar #1 exception failed.");
+//      code = -1000;
+//      try {
+//        var val = text.getStartPositionOfChar(4);
+//      } catch(e) {
+//        code = e.code;
+//      }
+//      assertEquals(code, DOMException.INDEX_SIZE_ERR, "getStartPositionOfChar #2 exception failed.");
+//      assertEquals(text.getEndPositionOfChar(0).x, 42, "getEndPositionOfChar(0).x returned invalid value.");
+//      assertEquals(text.getEndPositionOfChar(1).x, 42+23, "getEndPositionOfChar(1).x returned invalid value.");
+//      assertEquals(text.getEndPositionOfChar(2).x, 42+23+4711, "getEndPositionOfChar(2).x returned invalid value.");
+//      code = -1000;
+//      try {
+//        var val = text.getEndPositionOfChar(-17);
+//      } catch(e) {
+//        code = 0; // negative values might throw native exception since the api accepts only unsigned values
+//      }
+//      assert(code == 0, "getEndPositionOfChar #1 exception failed.");
+//      code = -1000;
+//      try {
+//        var val = text.getEndPositionOfChar(4);
+//      } catch(e) {
+//        code = e.code;
+//      }
+//      assertEquals(code, DOMException.INDEX_SIZE_ERR, "getEndPositionOfChar #2 exception failed.");
+      return 5;
+    },
+    function () {
+//      // test 78: SVG textPath and getRotationOfChar(), from Erik Dahlstrom
+//      //
+//      // The getRotationOfChar[4] method fetches the midpoint rotation
+//      // of a glyph defined by a character (in this testcase there is
+//      // a simple 1:1 correspondence between the two). The path is
+//      // defined in the svg.xml file, and consists of first a line
+//      // going down, then followed by a line that has a 45 degree
+//      // slope and then followed by a horizontal line. The length of
+//      // each path segment have been paired with the advance of each
+//      // glyph, so that each glyph will be on each of the three
+//      // different path segments (see text on a path layout rules[5]).
+//      // Thus the rotation of the first glyph is 90 degrees, the
+//      // second 45 degrees and the third 0 degrees.
+//      //
+//      // [4] http://www.w3.org/TR/SVG11/text.html#InterfaceSVGTextContentElement
+//      // [5] http://www.w3.org/TR/SVG11/text.html#TextpathLayoutRules
+//
+      var svgns = "http://www.w3.org/2000/svg";
+//      var xlinkns = "http://www.w3.org/1999/xlink";
+      var svgdoc = kungFuDeathGrip.firstChild.contentDocument;
+      assert(svgdoc, "contentDocument failed on <object> for svg document.");
+      var svg = svgdoc.documentElement;
+//      var text = svgdoc.createElementNS(svgns, "text");
+//      text.setAttribute("font-size", "4000");
+//      text.setAttribute("font-family", "ACID3svgfont");
+//      var textpath = svgdoc.createElementNS(svgns, "textPath");
+//      textpath.setAttributeNS(xlinkns, "xlink:href", "#path");
+//      var textContent = svgdoc.createTextNode("abc");
+//      textpath.appendChild(textContent);
+//      text.appendChild(textpath);
+//      svg.appendChild(text);
+//      assertEquals(text.getRotationOfChar(0), 90, "getRotationOfChar(0) failed.");
+//      assertEquals(text.getRotationOfChar(1), 45, "getRotationOfChar(1) failed.");
+//      assertEquals(text.getRotationOfChar(2), 0, "getRotationOfChar(2) failed.");
+//      var code = -1000;
+//      try {
+//        var val = text.getRotationOfChar(-1)
+//      } catch(e) {
+//        code = e.code;
+//      }
+//      assertEquals(code, DOMException.INDEX_SIZE_ERR, "getRotationOfChar #1 exception failed.");
+//      code = -1000;
+//      try {
+//        var val = text.getRotationOfChar(4)
+//      } catch(e) {
+//        code = e.code;
+//      }
+//      assertEquals(code, DOMException.INDEX_SIZE_ERR, "getRotationOfChar #2 exception failed.");
+      return 5;
+    },
+    function () {
+//      // test 79: a giant test for <svg:font>, from Cameron McCormack
+//      // This tests various features of SVG fonts from SVG 1.1.  It consists of
+//      // a <text> element with 33 characters, styled using an SVG font that has
+//      // different advance values for each glyph.  The script uses
+//      // SVGTextElementContent.getStartPositionOfChar() to determine where the
+//      // glyph corresponding to each character was placed, and thus to work out
+//      // whether the SVG font was used correctly.
+//      //
+//      // The font uses 100 units per em, and the text is set in 100px.  Since
+//      // font-size gives the size of the em box
+//      // (http://www.w3.org/TR/SVG11/text.html#DOMInterfaces), the scale of the
+//      // coordinate system for the glyphs is the same as the SVG document.
+//      //
+//      // The expectedAdvances array holds the expected advance value for each
+//      // character, and expectedKerning holds the (negative) kerning for each
+//      // character.  getPositionOfChar() returns the actual x coordinate for the
+//      // glyph, corresponding to the given character, and if multiple characters
+//      // correspond to the same glyph, the same position value is returned for
+//      // each of those characters.
+//      //
+//      // Here are the reasonings for the advance/kerning values.  Note that for
+//      // a given character at index i, the expected position is
+//      // sum(expectedAdvances[0:i-1] + expectedKerning[0:i-1]).
+//      //
+//      // char     advance  kerning  reasoning
+//      // -------  -------  -------  --------------------------------------------------
+//      // A        10000    0        Normal character mapping to a single glyph.
+//      // B        0        0        First character of a two character glyph, so the
+//      //                            current position isn't advanced until the second
+//      //                            character.
+//      // C        200      0        Second character of a two character glyph, so now
+//      //                            the position is advanced.
+//      // B        300      0        Although there is a glyph for "BC" in the font,
+//      //                            it appears after the glyph for "B", so the single
+//      //                            character glyph for "B" should be chosen instead.
+//      // D        1100     0        Normal character mapping to a single glyph.
+//      // A        10000    200      Kerning of -200 is specified in the font between
+//      //                            the "A" and "EE" glyphs.
+//      // E        0        0        The first character of a two character glyph "EE".
+//      // E        1300     0        The second character of a two character glyph.
+//      // U        0        0        This is a glyph for the six characters "U+0046",
+//      //                            which happen to look like a valid unicode range.
+//      //                            This tests that the <glyph unicode=""> in the
+//      //                            font matches exact strings rather than a range,
+//      //                            as used in the kerning elements.
+//      // +        0        0        Second character of six character glyph.
+//      // 0        0        0        Third character of six character glyph.
+//      // 0        0        0        Fourth character of six character glyph.
+//      // 4        0        0        Fifth character of six character glyph.
+//      // 6        1700     0        Sixth character of six character glyph.
+//      // U        0        0        The same six character glyph that looks like a
+//      //                            Unicode range.  One of the kerning elements has
+//      //                            u1="U+0046" u2="U+0046", which shouldn't match
+//      //                            this, because those attributes are interpreted
+//      //                            as Unicode ranges if they are, and normal
+//      //                            strings otherwise.  Thus there should be no
+//      //                            kerning between these two glyphs.
+//      // G        2300     200      Kerning is between this character and the next
+//      //                            "G", since there is an <hkern> element that
+//      //                            uses a Unicode range on its u1="" attribute
+//      //                            and a glyph name on its g2="" attribute which
+//      //                            both match "G".
+//      // G        2300     0        Normal character with kerning before it.
+//      // H        3100     0        A glyph with graphical content describing the
+//      //                            glyph, rather than a d="" attribute.
+//      // I        4300     0        Glyphs are checked in document order for one
+//      //                            that matches, but the first glyph with
+//      //                            unicode="I" also has lang="zh", which disqualifies
+//      //                            it.  Thus the second glyph with unicode="I"
+//      //                            is chosen.
+//      // I        4100     0        Since this I has xml:lang="zh" on it in the text,
+//      //                            the first glyph with lang="zh" matches.
+//      // J        4700     -4700    A normal glyph with kerning between the "J" and the
+//      //                            next glyph "A" equal to the advance of the "J"
+//      //                            glyph, so the position should stay the same.
+//      // A        10000    0        Normal glyph with kerning before it.
+//      // K        5900     0        The first glyph with unicode="K" does not match,
+//      //                            since it has orientation="v", so the second
+//      //                            glyph with unicode="K" is chosen.
+//      // <spc>    6100     0        The space character should select the glyph with
+//      //                            unicode=" ", despite it having a misleading
+//      //                            glyph-name="L".
+//      // L        6700     0        The "L" character should select the glyph with
+//      //                            unicode=" ", despite it having a misleading
+//      //                            glyph-name="spacev".
+//      // A        2900     0        An <altGlyph> element is used to select the
+//      //                            glyph for U+10085 instead of the one for "A".
+//      // U+10085  2900     0        Tests glyph selection with a non-plane-0
+//      //                            character.
+//      // A        10000    0        A final normal character.
+//      //
+//      // In addition, the script tests the value returned by
+//      // SVGTextContentElement.getNumberOfChars(), which in this case should be 34.
+//      // If it returned 33, then it incorrectly counted Unicode characters instead
+//      // of UTF-16 codepoints (probably).
+//      //
+//      // See http://www.w3.org/TR/SVG11/fonts.html for a description of the glyph
+//      // matching rules, and http://www.w3.org/TR/SVG11/text.html#DOMInterfaces
+//      // for a description of getStartPositionOfChar() and getNumberOfChars().
+//      //
+//      // Note also that the test uses DOMImplementation.createDocument() to create
+//      // the SVG document.  This seems to cause browsers trouble for the SVG DOM
+//      // interfaces, since the document isn't being "rendered" as it might be
+//      // if it were in an <iframe>.  Changing the test to use an <iframe> will
+//      // at least let you see the main part of the test running.
+//
+      var NS = {
+        svg: 'http://www.w3.org/2000/svg',
+        xml: 'http://www.w3.org/XML/1998/namespace',
+//        xlink: 'http://www.w3.org/1999/xlink'
+      };
+
+      var doc = kungFuDeathGrip.childNodes[1].contentDocument;
+      while (doc.hasChildNodes())
+        doc.removeChild(doc.firstChild);
+      doc.appendChild(doc.createElementNS(NS.svg, "svg:svg"));
+//
+//      var e = function (n, as, cs) {
+//        var elt = doc.createElementNS(NS.svg, n);
+//        if (as) {
+//          for (var an in as) {
+//            var idx = an.indexOf(':');
+//            var ns = null;
+//            if (idx != -1)
+//              ns = NS[an.substring(0, idx)];
+//            elt.setAttributeNS(ns, an, as[an]);
+//          }
+//        }
+//        if (cs) {
+//          for (var i in cs) {
+//            var c = cs[i];
+//            elt.appendChild(typeof c == 'string' ? doc.createTextNode(c) : c);
+//          }
+//        }
+//        return elt;
+//      }
+//
+//      doc.documentElement.appendChild(e('font', { 'horiz-adv-x': '10000'}, [e('font-face', { 'font-family': 'HCl', 'units-per-em': '100', 'ascent': '1000', 'descent': '500'}), e('missing-glyph', null, [e('path', { 'd': 'M100,0 h800 v-100 h-800 z'})]), e('glyph', { 'unicode': 'A', 'd': 'M100,0 h100 v-100 h-100 z'}), e('glyph', { 'unicode': 'BC', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '200'}), e('glyph', { 'unicode': 'B', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '300'}), e('glyph', { 'unicode': 'C', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '500'}), e('glyph', { 'unicode': 'BD', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '700'}), e('glyph', { 'unicode': 'D', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '1100'}), e('glyph', { 'unicode': 'EE', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '1300',  'glyph-name': 'grapefruit'}), e('glyph', { 'unicode': 'U+0046', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '1700'}), e('glyph', { 'unicode': 'F', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '1900'}), e('glyph', { 'unicode': 'G', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '2300', 'glyph-name': 'gee'}), e('glyph', { 'unicode': '\uD800\uDC85', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '2900', 'id': 'astral'}), e('glyph', { 'unicode': 'H', 'horiz-adv-x': '3100'}, [e('path', { 'd': 'M100,0 h100 v-100 h-100 z'})]), e('glyph', { 'unicode': 'I', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '4100', 'lang': 'zh'}), e('glyph', { 'unicode': 'I', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '4300'}), e('glyph', { 'unicode': 'J', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '4700'}), e('glyph', { 'unicode': 'K', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '5300', 'orientation': 'v'}), e('glyph', { 'unicode': 'K', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '5900'}), e('glyph', { 'unicode': ' ', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '6100', 'glyph-name': 'L'}), e('glyph', { 'unicode': 'L', 'd': 'M100,0 h100 v-100 h-100 z', 'horiz-adv-x': '6700', 'glyph-name': 'space'}), e('hkern', { 'u1': 'A', 'u2': 'EE', 'k': '1000'}), e('hkern', { 'u1': 'A', 'g2': 'grapefruit', 'k': '-200'}), e('hkern', { 'u1': 'U+0046', 'u2': 'U+0046', 'k': '-200'}), e('hkern', { 'u1': 'U+0047-0047', 'g2': 'gee', 'k': '-200'}), e('hkern', { 'u1': 'J', 'u2': 'A', 'k': '4700'})]));
+//      doc.documentElement.appendChild(e('text', { 'y': '100', 'font-family': 'HCl', 'font-size': '100px', 'letter-spacing': '0px', 'word-spacing': '0px'}, ['ABCBDAEEU+0046U+0046GGHI', e('tspan', { 'xml:lang': 'zh'}, ['I']), 'JAK L', e('altGlyph', { 'xlink:href': '#astral'}, ['A']), '\uD800\uDC85A']));
+//
+//      var t = doc.documentElement.lastChild;
+//
+//      var characterDescriptions = [
+//        "a normal character",
+//        "the first character of a two-character glyph",
+//        "the second character of a two-character glyph",
+//        "a normal character, which shouldn't be the first character of a two-character glyph",
+//        "a normal character, which shouldn't be the second character of a two-character glyph",
+//        "a normal character, which has some kerning after it",
+//        "the first character of a two-character glyph, which has some kerning before it",
+//        "the second character of a two-character glyph, which has some kerning before it",
+//        "the first character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning after it, but this glyph does not",
+//        "the second character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning after it, but this glyph does not",
+//        "the third character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning after it, but this glyph does not",
+//        "the fourth character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning after it, but this glyph does not",
+//        "the fifth character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning after it, but this glyph does not",
+//        "the sixth character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning after it, but this glyph does not",
+//        "the first character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning before it, but this glyph does not",
+//        "the second character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning before it, but this glyph does not",
+//        "the third character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning before it, but this glyph does not",
+//        "the fourth character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning before it, but this glyph does not",
+//        "the fifth character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning before it, but this glyph does not",
+//        "the sixth character of a six-character glyph, which happens to look like a Unicode range, where the range-specified glyph has kerning before it, but this glyph does not",
+//        "a normal character, which has some kerning after it that is specified by glyph name",
+//        "a normal character, which has some kerning before it that is specified by glyph name",
+//        "a normal character, whose glyph is given by child graphical content of the <glyph> element",
+//        "a normal character, whose glyph should not match the one with a lang=\"\" attribute on it",
+//        "a normal character, whose glyph should match the one with a lang=\"\" attribute on it",
+//        "a normal character, which has some kerning after it that is equal to the advance of the character",
+//        "a normal character, which has some kerning before it that is equal to the advance of the previous character",
+//        "a normal character, whose glyph should not match the one with an orientation=\"v\" attribute on it",
+//        "a space character, which has a misleading glyph-name=\"\" attribute",
+//        "a normal character, which has a misleading glyph-name=\"\" attribute",
+//        "a normal character, whose glyph is chosen to be another by using <altGlyph>",
+//        "a character not in Plane 0 (high surrogate pair)",
+//        "a character not in Plane 0 (low surrogate pair)",
+//        "a normal character",
+//      ];
+//
+//      var expectedAdvances = [
+//        10000,       // A
+//        0,           // BC [0]
+//        200,         // BC [1]
+//        300,         // B
+//        1100,        // D
+//        10000,       // A
+//        0,           // EE [0]
+//        1300,        // EE [1]
+//        0,           // U+0046 [0]
+//        0,           // U+0046 [1]
+//        0,           // U+0046 [2]
+//        0,           // U+0046 [3]
+//        0,           // U+0046 [4]
+//        1700,        // U+0046 [5]
+//        0,           // U+0046 [0]
+//        0,           // U+0046 [1]
+//        0,           // U+0046 [2]
+//        0,           // U+0046 [3]
+//        0,           // U+0046 [4]
+//        1700,        // U+0046 [5]
+//        2300,        // G
+//        2300,        // G
+//        3100,        // H
+//        4300,        // I
+//        4100,        // I (zh)
+//        4700,        // J
+//        10000,       // A
+//        5900,        // K
+//        6100,        // <space>
+//        6700,        // L
+//        2900,        // A (using &#x10085; altGlyph)
+//        0,           // &#x10085; high surrogate pair
+//        2900,        // &#x10085; low surrogate pair
+//        10000,       // A
+//      ];
+//
+//      var expectedKerning = [
+//        0,           // A
+//        0,           // BC [0]
+//        0,           // BC [1]
+//        0,           // B
+//        0,           // D
+//        200,         // A
+//        0,           // EE [0]
+//        0,           // EE [1]
+//        0,           // U+0046 [0]
+//        0,           // U+0046 [1]
+//        0,           // U+0046 [2]
+//        0,           // U+0046 [3]
+//        0,           // U+0046 [4]
+//        0,           // U+0046 [5]
+//        0,           // U+0046 [0]
+//        0,           // U+0046 [1]
+//        0,           // U+0046 [2]
+//        0,           // U+0046 [3]
+//        0,           // U+0046 [4]
+//        0,           // U+0046 [5]
+//        200,         // G
+//        0,           // G
+//        0,           // H
+//        0,           // I
+//        0,           // I (zh)
+//        -4700,       // J
+//        0,           // A
+//        0,           // K
+//        0,           // <space>
+//        0,           // L
+//        0,           // A (using &#x10085; altGlyph)
+//        0,           // &#x10085; high surrogate pair
+//        0,           // &#x10085; low surrogate pair
+//        0,           // A
+//      ];
+//
+//      assertEquals(t.getNumberOfChars(), expectedAdvances.length, 'SVGSVGTextElement.getNumberOfChars() incorrect');
+//
+//      var expectedPositions = [0];
+//      for (var i = 0; i < expectedAdvances.length; i++)
+//        expectedPositions.push(expectedPositions[i] + expectedAdvances[i] + expectedKerning[i]);
+//
+//      var actualPositions = [];
+//      for (var i = 0; i < t.getNumberOfChars(); i++)
+//        actualPositions.push(t.getStartPositionOfChar(i).x);
+//      actualPositions.push(t.getEndPositionOfChar(t.getNumberOfChars() - 1).x);
+//
+//      for (var i = 0; i < expectedPositions.length; i++) {
+//        if (expectedPositions[i] != actualPositions[i]) {
+//          var s = "character position " + i + ", which is ";
+//          if (i == 0) {
+//            s += "before " + characterDescriptions[0];
+//          } else if (i == expectedPositions.length - 1) {
+//            s += "after " + characterDescriptions[characterDescriptions.length - 1];
+//          } else {
+//            s += "between " + characterDescriptions[i - 1] + " and " + characterDescriptions[i];
+//          }
+//          s += ", is " + actualPositions[i] + " but should be " + expectedPositions[i] + ".";
+//          fail(s);
+//        }
+//      }
+      return 5;
+    },
+    function () {
+      // test 80: remove the iframes and the object
+      // (when fixing the test for http://dbaron.org/mozilla/visited-privacy,
+      // this section was flipped around so the linktest check is done first;
+      // this is to prevent the 'retry' from failing the second time since by
+      // then the kungFuDeathGrip has been nullified, if we do it first)
+      // first, check that the linktest is loaded
+      var a = document.links[1];
+      assert(!(a == null), "linktest was null");
+      assert(a.textContent == "YOU SHOULD NOT SEE THIS AT ALL", "linktest link couldn't be found"); // changed text when fixing http://dbaron.org/mozilla/visited-privacy
+      if (a.hasAttribute('class'))
+        return "retry"; // linktest onload didn't fire -- could be a networking issue, check that first
+      assert(!(kungFuDeathGrip == null), "kungFuDeathGrip was null");
+      assert(!(kungFuDeathGrip.parentNode == null), "kungFuDeathGrip.parentNode was null");
+      // ok, now remove the iframes
+      kungFuDeathGrip.parentNode.removeChild(kungFuDeathGrip);
+      kungFuDeathGrip = null;
+      // check that the xhtml files worked right
+      assert(notifications['xhtml.1'], "Script in XHTML didn't execute");
+      assert(!notifications['xhtml.2'], "XML well-formedness error didn't stop script from executing");
+      assert(!notifications['xhtml.3'], "Script executed despite having wrong namespace");
+      return 5;
+    },
+
+    // bucket 6: ECMAScript
+    function () {
+      // test 81: length of arrays with elisions at end
+      var t1 = [,];
+      var t2 = [,,];
+      assertEquals(t1.length, 1, "[,] doesn't have length 1");
+      assertEquals(t2.length, 2, "[,,] doesn't have length 2");
+      return 6;
+    },
+    function () {
+      // test 82: length of arrays with elisions in the middle
+      var t3 = ['a', , 'c'];
+      assertEquals(t3.length, 3, "['a',,'c'] doesn't have length 3");
+      assert(0 in t3, "no 0 in t3");
+      assert(!(1 in t3), "unexpected 1 in t3");
+      assert(2 in t3, "no 2 in t3");
+      assertEquals(t3[0], 'a', "t3[0] wrong");
+      assertEquals(t3[2], 'c', "t3[2] wrong");
+      return 6;
+    },
+    function () {
+      // test 83: array methods
+      var x = ['a', 'b', 'c'];
+      assertEquals(x.unshift('A', 'B', 'C'), 6, "array.unshift() returned the wrong value");
+      var s = x.join(undefined);
+      assertEquals(s, 'A,B,C,a,b,c', "array.join(undefined) used wrong separator"); // qv 15.4.4.5:3
+      return 6;
+    },
+    function () {
+      // test 84: converting numbers to strings
+      assertEquals((0.0).toFixed(4), "0.0000", "toFixed(4) wrong for 0");
+      assertEquals((-0.0).toFixed(4), "0.0000", "toFixed(4) wrong for -0");
+      assertEquals((0.00006).toFixed(4), "0.0001", "toFixed(4) wrong for 0.00006");
+      assertEquals((-0.00006).toFixed(4), "-0.0001", "toFixed(4) wrong for -0.00006");
+      assertEquals((0.0).toExponential(4), "0.0000e+0", "toExponential(4) wrong for 0");
+      assertEquals((-0.0).toExponential(4), "0.0000e+0", "toExponential(4) wrong for -0");
+      var x = 7e-4;
+      assertEquals(x.toPrecision(undefined), x.toString(undefined), "toPrecision(undefined) was wrong");
+      return 6;
+    },
+    function () {
+      // test 85: strings and string-related operations
+      // substr() and negative numbers
+      assertEquals("scathing".substr(-7, 3), "cat", "substr() wrong with negative numbers");
+      return 6;
+    },
+    function () {
+      // test 86: Date tests -- methods passed no arguments
+      var d = new Date();
+      assert(isNaN(d.setMilliseconds()), "calling setMilliseconds() with no arguments didn't result in NaN");
+      assert(isNaN(d), "date wasn't made NaN");
+      assert(isNaN(d.getDay()), "date wasn't made NaN");
+      return 6;
+    },
+    function () {
+      // test 87: Date tests -- years
+      var d1 = new Date(Date.UTC(99.9, 6));
+      assertEquals(d1.getUTCFullYear(), 1999, "Date.UTC() didn't do proper 1900 year offsetting");
+      var d2 = new Date(98.9, 6);
+      assertEquals(d2.getFullYear(), 1998, "new Date() didn't do proper 1900 year offsetting");
+      return 6;
+    },
+    function () {
+      // test 88: ES3 section 7.6:3 (unicode escapes can't be used to put non-identifier characters into identifiers)
+      // and there's no other place for them in the syntax (other than strings, of course)
+      var ok = false;
+      try {
+        eval("var test = { };\ntest.i= 0;\ntest.i\\u002b= 1;\ntest.i;\n");
+      } catch (e) {
+        ok = true;
+      }
+      assert(ok, "\\u002b was not considered a parse error in script");
+      return 6;
+    },
+    function () {
+      // test 89: Regular Expressions
+      var ok = true;
+      // empty classes in regexps
+      try {
+        eval("/TA[])]/.exec('TA]')");
+        // JS regexps aren't like Perl regexps, if their character
+        // classes start with a ] that means they're empty. So this
+        // is a syntax error; if we get here it's a bug.
+        ok = false;
+      } catch (e) { }
+      assert(ok, "orphaned bracket not considered parse error in regular expression literal");
+      try {
+        if (eval("/[]/.exec('')"))
+          ok = false;
+      } catch (e) {
+        ok = false;
+      }
+      assert(ok, "/[]/ either failed to parse or matched something");
+      return 6;
+    },
+    function () {
+      // test 90: Regular Expressions
+      // not back references.
+      assert(!(/(1)\0(2)/.test("12")), "NUL in regexp incorrectly ignored");
+      assert((/(1)\0(2)/.test("1" + "\0" + "2")), "NUL in regexp didn't match correctly");
+      assert(!(/(1)\0(2)/.test("1\02")), "octal 2 unexpectedly matched NUL");
+      assertEquals(nullInRegexpArgumentResult, "passed", "failed //.test() check"); // nothing to see here, move along now
+      // back reference to future capture
+      var x = /(\3)(\1)(a)/.exec('cat'); // the \3 matches the empty string, qv. ES3:15.10.2.9
+      assert(x, "/(\\3)(\\1)(a)/ failed to match 'cat'");
+      assertEquals(x.length, 4, "/(\\3)(\\1)(a)/ failed to return four components");
+      assertEquals(x[0], "a", "/(\\3)(\\1)(a)/ failed to find 'a' in 'cat'");
+      assert(x[1] === "", "/(\\3)(\\1)(a)/ failed to find '' in 'cat' as first part");
+      assert(x[2] === "", "/(\\3)(\\1)(a)/ failed to find '' in 'cat' as second part");
+      assertEquals(x[3], "a", "/(\\3)(\\1)(a)/ failed to find 'a' in 'cat' as third part");
+      // negative lookahead
+      x = /(?!(text))(te.t)/.exec("text testing");
+      assertEquals(x.length, 3, "negative lookahead test failed to return the right number of bits");
+      assertEquals(x[0], "test", "negative lookahead test failed to find the right text");
+      assert(x[1] === undefined, "negative lookahead test failed to return undefined for negative lookahead capture");
+      assert(x[2] === "test", "negative lookahead test failed to find the right second capture");
+      return 6;
+    },
+    function () {
+      // test 91: check that properties are enumerable by default
+      var test = {
+        constructor: function() { return 1; },
+        toString: function() { return 2; },
+        toLocaleString: function() { return 3; },
+        valueOf: function() { return 4; },
+        hasOwnProperty: function() { return 5; },
+        isPrototypeOf: function() { return 6; },
+        propertyIsEnumerable: function() { return 7; },
+        prototype: function() { return 8; },
+        length: function() { return 9; },
+        unique: function() { return 10; }
+      };
+      var results = [];
+      for (var property in test)
+        results.push([test[property](), property]);
+      results.sort(function(a, b) {
+        if (a[0] < b[0]) return -1;
+        if (a[0] > b[0]) return 1;
+        return 0;
+      });
+      assertEquals(results.length, 10, "missing properties");
+      for (var index = 0; index < 10; index += 1)
+        assertEquals(results[index][0], index+1, "order wrong at results["+index+"] == ");
+      var index = 0;
+      assertEquals(results[index++][1], "constructor", "failed to find constructor in expected position");
+      assertEquals(results[index++][1], "toString", "failed to find toString in expected position");
+      assertEquals(results[index++][1], "toLocaleString", "failed to find toLocaleString in expected position");
+      assertEquals(results[index++][1], "valueOf", "failed to find valueOf in expected position");
+      assertEquals(results[index++][1], "hasOwnProperty", "failed to find hasOwnProperty in expected position");
+      assertEquals(results[index++][1], "isPrototypeOf", "failed to find isPrototypeOf in expected position");
+      assertEquals(results[index++][1], "propertyIsEnumerable", "failed to find propertyIsEnumerable in expected position");
+      assertEquals(results[index++][1], "prototype", "failed to find prototype in expected position");
+      assertEquals(results[index++][1], "length", "failed to find length in expected position");
+      assertEquals(results[index++][1], "unique", "failed to find unique in expected position");
+      return 6;
+    },
+    function () {
+      // test 92: internal properties of Function objects
+      // constructor is not ReadOnly
+      var f1 = function () { 1 };
+      f1.prototype.constructor = "hello world";
+      var f1i = new f1();
+      assert(f1i.constructor === "hello world", "Function object's prototype's constructor was ReadOnly");
+      // constructor is DontEnum (indeed, no properties at all on a new Function object)
+      var f2 = function () { 2 };
+      var f2i = new f2();
+      var count = 0;
+      for (var property in f2i) {
+        assert(property != "constructor", "Function object's prototype's constructor was not DontEnum");
+        count += 1;
+      }
+      assertEquals(count, 0, "Function object had unexpected properties");
+      // constructor is not DontDelete
+      var f3 = function (a, b) { 3 };
+      delete f3.prototype.constructor;
+      var f3i = new f3();
+      assertEquals(f3i.constructor, Object.prototype.constructor, "Function object's prototype's constructor was DontDelete (or got magically replaced)");
+      return 6;
+    },
+    function () {
+      // test 93: FunctionExpression semantics
+      var functest;
+      var vartest = 0;
+      var value = (function functest(arg) {
+        if (arg)
+          return 1;
+        vartest = 1;
+        functest = function (arg) { return 2; }; // this line does nothing as 'functest' is ReadOnly here
+        return functest(true); // this is therefore tail recursion and returns 1
+      })(false);
+      assertEquals(vartest, 1, "rules in 10.1.4 not followed in FunctionBody");
+      assertEquals(value, 1, "semantics of FunctionExpression: function Identifier ... not followed");
+      assert(!functest, "Property in step 4 of FunctionExpression: function Identifier ... leaked to parent scope");
+      return 6;
+    },
+    function () {
+      // test 94: exception scope
+      var test = 'pass';
+      try {
+        throw 'fail';
+      } catch (test) {
+        test += 'ing';
+      }
+      assertEquals(test, 'pass', 'outer scope poisoned by exception catch{} block');
+      return 6;
+    },
+    function () {
+      // test 95: types of expressions
+      var a = []; var s;
+      s = a.length = "2147483648";
+      assertEquals(typeof s, "string", "type of |\"2147483648\"| is not string");
+      return 6;
+    },
+    function () {
+      // test 96: encodeURI() and encodeURIComponent() and null bytes
+      assertEquals(encodeURIComponent(String.fromCharCode(0)), '%00', "encodeURIComponent failed to encode U+0000");
+      assertEquals(encodeURI(String.fromCharCode(0)), '%00', "encodeURI failed to encode U+0000");
+      return 6;
+    },
+
+    // URIs
+    function () {
+      // test 97: data: URI parsing
+      assertEquals(d1, "one", "data: failed as escaped");
+      assertEquals(d2, "two", "data: failed as base64");
+      assertEquals(d3, "three", "data: failed as base64 escaped");
+      assertEquals(d4, "four", "data: failed as base64 with spaces");
+      assertEquals(d5, "five's", "data: failed with backslash");
+      return 7;
+    },
+
+    // XHTML
+    function () {
+      // test 98: XHTML and the DOM
+      // (special test)
+      var doctype = document.implementation.createDocumentType("html", "-//W3C//DTD XHTML 1.0 Strict//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd");
+// COMMENTED OUT FOR 2011 UPDATE - doctypes are moving towards having an owner, like other nodes
+//      assertEquals(doctype.ownerDocument, null, "doctype's ownerDocument was wrong after creation");
+      var doc = document.implementation.createDocument("http://www.w3.org/1999/xhtml", "html", doctype);
+      doc.documentElement.appendChild(doc.createElementNS("http://www.w3.org/1999/xhtml", "head"));
+      doc.documentElement.appendChild(doc.createElementNS("http://www.w3.org/1999/xhtml", "body"));
+      var t = doc.createElementNS("http://www.w3.org/1999/xhtml", "title");
+      doc.documentElement.firstChild.appendChild(t);
+      // ok we have a conforming XHTML1 doc in |doc| now.
+      assertEquals(doctype.ownerDocument, doc, "doctype's ownerDocument didn't change when it was assigned to another document");
+      assertEquals(doc.title, "", "document had unexpected title");
+      t.textContent = "Sparrow";
+      assertEquals(doc.title, "Sparrow", "document.title did not update dynamically");
+      doc.body.appendChild(doc.createElementNS("http://www.w3.org/1999/xhtml", "form"));
+      assertEquals(doc.forms.length, 1, "document.forms not updated after inserting a form");
+      return 7;
+    },
+
+    // Sanity
+    function () {
+      // test 99: check for the weirdest bug ever
+      var a = document.createElement('a');
+      a.setAttribute('href', 'http://www.example.com/');
+      a.appendChild(document.createTextNode('www.example.com'));
+      a.href = 'http://hixie.ch/';
+      assertEquals(a.firstChild.data, "www.example.com", "sanity did not prevail");
+      a.href = 'http://damowmow.com/';
+      assertEquals(a.firstChild.data, "www.example.com", "final test failed");
+      return 7;
+    }
+
+  ];
+  var log = '';
+  var delay = 10;
+  var score = 0, index = 0, retry = 0, errors = 0;
+  function update() {
+    var span = document.getElementById('score'); // not cached by JS
+    span.nextSibling.removeAttribute('class'); // no-op after first loop
+    span.nextSibling.nextSibling.firstChild.data = tests.length; // no-op after first loop
+    if (index < tests.length) {
+      var zeroPaddedIndex = index < 10 ? '0' + index : index;
+      try {
+        var beforeTest = new Date();
+        var result = tests[index]();
+        var elapsedTest = new Date() - beforeTest;
+        if (result == "retry") {
+          // some tests uses this magical mechanism to wait for support files to load
+          // we will give this test 500 attempts (5000ms) before aborting
+          retry += 1;
+          if (retry < 500) {
+            setTimeout(update, delay);
+            return;
+          }
+          fail("timeout -- could be a networking issue");
+        } else if (result) {
+          var bucket = document.getElementById('bucket' + result);
+          if (bucket)
+            bucket.className += 'P';
+          score += 1;
+          if (retry > 0) {
+            errors += 1;
+            log += "Test " + zeroPaddedIndex + " passed, but took " + retry + " attempts (less than perfect).\n";
+          } else if (elapsedTest > 33) { // 30fps
+            errors += 1;
+            log += "Test " + zeroPaddedIndex + " passed, but took " + elapsedTest + "ms (less than 30fps)\n";
+          }
+        } else {
+          fail("no error message");
+        }
+      } catch (e) {
+        var s;
+        if (e.message)
+          s = e.message.replace(/\s+$/, "");
+        else
+          s = e;
+        errors += 1;
+        log += "Test " + zeroPaddedIndex + " failed: " + s + "\n";
+      };
+      retry = 0;
+      index += 1;
+      span.firstChild.data = score;
+      setTimeout(update, delay);
+    } else {
+      var endTime = new Date();
+      var elapsedTime = ((endTime - startTime) - (delay * tests.length)) / 1000;
+      log += "Total elapsed time: " + elapsedTime.toFixed(2) + "s";
+      if (errors == 0)
+        log += "\nNo JS errors and no timing issues.\nWas the rendering pixel-for-pixel perfect too?";
+      document.documentElement.classList.remove("reftest-wait");
+    }
+  }
+  function report(event) {
+    // for debugging either click the "A" in "Acid3" (to get an alert) or shift-click it (to get a report)
+    if (event.shiftKey) {
+      var w = window.open();
+      w.document.write('<pre>Failed ' + (tests.length - score) + ' of ' + tests.length + ' tests.\n' +
+                       log.replace(/&/g,'&amp;').replace(RegExp('<', 'g'), '&lt;').replace('\0', '\\0') +
+                       '<\/pre>');
+      w.document.close();
+    } else {
+      alert('Failed ' + (tests.length - score) + ' test' + (score == 1 ? '' : 's') + '.\n' + log)
+    }
+  }
+ </script>
+ <body onload="update()  /* this attribute's value is tested in one of the tests */ ">
+  <h1 onclick="report(event)">Acid3</h1>
+  <div class="buckets"
+   ><p id="bucket1" class="z"></p
+   ><p id="bucket2" class="z"></p
+   ><p id="bucket3" class="z"></p
+   ><p id="bucket4" class="z"></p
+   ><p id="bucket5" class="z"></p
+   ><p id="bucket6" class="z"></p>
+  </div>
+  <p id="result"><span id="score">JS</span><span id="slash" class="hidden">/</span><span>?</span></p>
+  <!-- The following line is used in a number of the tests. It is done using document.write() to sidestep complaints of validity. -->
+  <script type="text/javascript">document.write('<map name=""><area href="" shape="rect" coords="2,2,4,4" alt="<\'>"><iframe src="empty.png">FAIL<\/iframe><iframe src="empty.txt">FAIL<\/iframe><iframe src="empty.html" id="selectors"><\/iframe><form action="" name="form"><input type=HIDDEN><\/form><table><tr><td><p><\/tbody> <\/table><\/map>');</script>
+  <p id="instructions">To pass the test,<span></span> a browser must use its default settings, the animation has to be smooth, the score has to end on 100/100, and the final page has to look exactly, pixel for pixel, like <a href="reference.sub.html">this reference rendering</a>.</p>
+  <p id="remove-last-child-test">Scripting must be enabled to use this test.</p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.1 b/tests/wpt/web-platform-tests/acid/acid3/xhtml.1
new file mode 100755
index 0000000000000..8daafce8cd276
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/xhtml.1
@@ -0,0 +1,11 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>Test</title>
+ </head>
+ <body>
+  <p> <strong> XHTML Test </strong> </p>
+  <script type="text/javascript">
+   parent.notify("xhtml.1")
+  </script>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.1.headers b/tests/wpt/web-platform-tests/acid/acid3/xhtml.1.headers
new file mode 100644
index 0000000000000..f203c6368ef99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/xhtml.1.headers
@@ -0,0 +1 @@
+Content-Type: text/xml
diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.2 b/tests/wpt/web-platform-tests/acid/acid3/xhtml.2
new file mode 100755
index 0000000000000..c7af4f1c27fa2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/xhtml.2
@@ -0,0 +1,11 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>Test</title>
+ </head>
+ <body>
+  <p> <strong/> Parsing Test </strong> </p>
+  <script type="text/javascript">
+   parent.notify("xhtml.2")
+  </script>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.2.headers b/tests/wpt/web-platform-tests/acid/acid3/xhtml.2.headers
new file mode 100644
index 0000000000000..f203c6368ef99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/xhtml.2.headers
@@ -0,0 +1 @@
+Content-Type: text/xml
diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.3 b/tests/wpt/web-platform-tests/acid/acid3/xhtml.3
new file mode 100755
index 0000000000000..8cd8db7360827
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/xhtml.3
@@ -0,0 +1,11 @@
+<html xmlns="http://www.w3.org/1999/xhtml#">
+ <head>
+  <title>Test</title>
+ </head>
+ <body>
+  <p> <strong> Namespace Test </strong> </p>
+  <script type="text/javascript">
+   parent.notify("xhtml.3")
+  </script>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.3.headers b/tests/wpt/web-platform-tests/acid/acid3/xhtml.3.headers
new file mode 100644
index 0000000000000..f203c6368ef99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/acid/acid3/xhtml.3.headers
@@ -0,0 +1 @@
+Content-Type: text/xml
diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_insecure_context.html b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_insecure_context.html
index de900e0489430..9a7c91492b58d 100644
--- a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_insecure_context.html
+++ b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_insecure_context.html
@@ -15,6 +15,6 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorInsecureContext(AmbientLightSensor);
+runGenericSensorInsecureContext("AmbientLightSensor");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/ambient-light/idlharness.https.html b/tests/wpt/web-platform-tests/ambient-light/idlharness.https.html
index cf43d5476e26a..46b019cd18265 100644
--- a/tests/wpt/web-platform-tests/ambient-light/idlharness.https.html
+++ b/tests/wpt/web-platform-tests/ambient-light/idlharness.https.html
@@ -8,47 +8,30 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/WebIDLParser.js"></script>
 <script src="/resources/idlharness.js"></script>
-<div id="log"></div>
-
-<script id="idl" type="text/plain">
-interface EventTarget {
-};
-
-interface EventHandler {
-};
-</script>
-
-<script id="ambient-light-idl" type="text/plain">
-// The interface of Sensor is defined in
-// https://www.w3.org/TR/generic-sensor/#idl-index
-[SecureContext, Exposed=Window]
-interface Sensor : EventTarget {
-  readonly attribute boolean activated;
-  readonly attribute DOMHighResTimeStamp? timestamp;
-  void start();
-  void stop();
-  attribute EventHandler onreading;
-  attribute EventHandler onactivate;
-  attribute EventHandler onerror;
-};
-
-[Constructor(optional SensorOptions sensorOptions), Exposed=Window]
-interface AmbientLightSensor : Sensor {
-  readonly attribute unrestricted double? illuminance;
-};
-</script>
-
 <script>
-(() => {
-  "use strict";
-  let idl_array = new IdlArray();
-  idl_array.add_untested_idls(document.getElementById('idl').textContent);
-  idl_array.add_idls(document.getElementById('ambient-light-idl').textContent);
+"use strict";
 
+function doTest([dom, generic_sensor, ambient_light]) {
+  const idl_array = new IdlArray();
+  idl_array.add_untested_idls(dom);
+  idl_array.add_untested_idls('interface EventHandler {};');
+  idl_array.add_idls(generic_sensor, { only: ['Sensor'] });
+  idl_array.add_idls(ambient_light);
   idl_array.add_objects({
-    AmbientLightSensor: ['new AmbientLightSensor();']
+    AmbientLightSensor: ['new AmbientLightSensor()']
   });
-
   idl_array.test();
-})();
+}
+
+function fetchText(url) {
+  return fetch(url).then((response) => response.text());
+}
+
+promise_test(() => {
+  return Promise.all([
+    "/interfaces/dom.idl",
+    "/interfaces/generic-sensor.idl",
+    "/interfaces/ambient-light.idl",
+  ].map(fetchText)).then(doTest);
+}, "Test driver");
 </script>
diff --git a/tests/wpt/web-platform-tests/background-fetch/mixed-content-and-allowed-schemes.https.window.js b/tests/wpt/web-platform-tests/background-fetch/mixed-content-and-allowed-schemes.https.window.js
index 50614a3565b0d..f9ebafcbbf423 100644
--- a/tests/wpt/web-platform-tests/background-fetch/mixed-content-and-allowed-schemes.https.window.js
+++ b/tests/wpt/web-platform-tests/background-fetch/mixed-content-and-allowed-schemes.https.window.js
@@ -26,10 +26,9 @@ backgroundFetchTest((t, bgFetch) => {
   return bgFetch.fetch(uniqueTag(), 'http://[::1]');
 }, 'loopback IPv6 http: fetch should register ok');
 
-// http://localhost is not tested here since the correct behavior from
-// https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy
-// depends on whether the UA conforms to the name resolution rules in
-// https://tools.ietf.org/html/draft-west-let-localhost-be-localhost
+backgroundFetchTest((t, bgFetch) => {
+  return bgFetch.fetch(uniqueTag(), 'http://localhost');
+}, 'localhost http: fetch should register ok');
 
 backgroundFetchTest((t, bgFetch) => {
   return promise_rejects(t, new TypeError(),
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/allowed.css b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/allowed.css
deleted file mode 100644
index ace5434897396..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/allowed.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#test {
-	color: green;
-}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-allow.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-allow.sub.html
deleted file mode 100644
index 14377740736f4..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-allow.sub.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>base-uri-allow</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-base-uri http://www1.{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline' http://www1.{{host}}:{{ports[http][0]}}; connect-src 'self';
--->
-    <base href="http://www1.{{host}}:{{ports[http][0]}}/">
-    <script>
-        test(function() {
-            if ('{{ports[http][0]}}' == '80' ||
-               '{{ports[http][0]}}' == '443') {
-                assert_equals(document.baseURI, 'http://www1.{{host}}/');
-            } else {
-                assert_equals(document.baseURI, 'http://www1.{{host}}' + ':{{ports[http][0]}}/');
-            }
-
-            log("TEST COMPLETE")
-        });
-
-    </script>
-</head>
-
-<body>
-    <p>Check that base URIs can be set if they do not violate the page's policy.</p>
-    <div id="log"></div>
-    <script async defer src="./content-security-policy/support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-allow.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-allow.sub.html.sub.headers
deleted file mode 100644
index e749d72389098..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-allow.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: base-uri-allow={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: base-uri http://www1.{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline' http://www1.{{host}}:{{ports[http][0]}}; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-deny.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-deny.sub.html
deleted file mode 100644
index f2b7c591e95f5..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-deny.sub.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>base-uri-deny</title>
-    <base href="http://www1.{{host}}:{{ports[http][0]}}/">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS document.baseURI is document.location.href","TEST COMPLETE"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-base-uri 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-    <script>
-        var base = document.createElement('base');
-        base.href = 'http://www1.{{host}}:{{ports[http][0]}}/';
-        document.head.appendChild(base);
-        if (document.baseURI == document.location.href) {
-            log("PASS document.baseURI is document.location.href");
-            log("TEST COMPLETE");
-        }
-
-    </script>
-</head>
-
-<body>
-    <p>Check that base URIs cannot be set if they violate the page's policy.</p>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=base-uri%20&apos;self&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-deny.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-deny.sub.html.sub.headers
deleted file mode 100644
index 0312c46d07c5c..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-deny.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: base-uri-deny={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: base-uri 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html.sub.headers
deleted file mode 100644
index 88cbfda0ef0b6..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: form-action-src-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html.sub.headers
deleted file mode 100644
index 29351c00843ce..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: form-action-src-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: form-action 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html.sub.headers
deleted file mode 100644
index 1abbcf50c404c..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: form-action-src-default-ignored={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: default-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; style-src 'self'; frame-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html.sub.headers
deleted file mode 100644
index ac8761518c894..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: form-action-src-get-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html.sub.headers
deleted file mode 100644
index e7a044dbcca4a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: form-action-src-get-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: form-action 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html.sub.headers
deleted file mode 100644
index ffa2288c051ce..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: form-action-src-javascript-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: form-action 'none'; script-src 'self' 'nonce-noncynonce'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html.sub.headers
deleted file mode 100644
index ee767f4a77c37..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: form-action-src-redirect-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html.sub.headers
deleted file mode 100644
index 3cd3351921653..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: meta-outside-head={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'none'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html.sub.headers
deleted file mode 100644
index 4e5b31b2a6b89..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: plugintypes-mismatched-data={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html.sub.headers
deleted file mode 100644
index 38a7450ab72c6..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: plugintypes-mismatched-url={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html.sub.headers
deleted file mode 100644
index ea938378afc5c..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: plugintypes-notype-data={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html.sub.headers
deleted file mode 100644
index ffe26cdf169c7..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: plugintypes-notype-url={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html.sub.headers
deleted file mode 100644
index 7fef2a5b560f3..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: plugintypes-nourl-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: plugin-types application/x-webkit-test-netscape; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html
deleted file mode 100644
index b5cc5a5a40fb3..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>plugintypes-nourl-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-plugin-types text/plain; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    This test passes if there is a CSP violation sayingthe plugin was blocked.
-    <object type="application/x-webkit-test-netscape"></object>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=plugin-types%20text/plain"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html.sub.headers
deleted file mode 100644
index 709bf90df99b8..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: plugintypes-nourl-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: plugin-types text/plain; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html.sub.headers
deleted file mode 100644
index cd95439130b7d..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-wildcards-disallowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'nonce-nonce' *; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers
deleted file mode 100644
index e0fe373b6280b..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: scripthash-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'sha256-IFmozo9WnnsMXVl/Ka8XzJ3Nd8yzS2zA2ME0mwtd+Ck=' 'sha256-jSpTmJKcrnHttKdYM/wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn/UmK7v/K77t+fvfxA89QT/K9qPNyE=' 'sha256-K+7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html.sub.headers
deleted file mode 100644
index 6a92e06f4f4ea..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: scripthash-basic-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'sha256-k7iO9DPkNQ7PcwPP+8XyYuRiCJ0p76Ofveol9g3mFNs=' 'sha256-EgE/bwVJ+ZLL9F5hNjDqD4C7nlFFrdDaKeNIJ2cUem4='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html
deleted file mode 100644
index a11a224ae1157..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-    <title>script-hash allowed from default-src</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    
-    <script>done();</script>
-    </head>
-
-    <body>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-    </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html.sub.headers
deleted file mode 100644
index d8893af4129f3..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: scripthash-default-src={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: default-src 'self' 'sha256-sc3CeiHrlck5tH2tTC4MnBYFnI9D5zp8f9odqnmGQjE='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html.sub.headers
deleted file mode 100644
index fb3fc76550ee3..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: scripthash-ignore-unsafeinline={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' unsafe-inline' 'sha256-k7iO9DPkNQ7PcwPP+8XyYuRiCJ0p76Ofveol9g3mFNs=' 'sha256-EgE/bwVJ+ZLL9F5hNjDqD4C7nlFFrdDaKeNIJ2cUem4='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers
deleted file mode 100644
index a23724f8ab400..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: scripthash-unicode-normalization={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'nonce-nonceynonce' 'sha256-9UFeeZbvnMa0tLNu76v96T4Hh+UtDWHm2lPQJoTWb9c='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html.sub.headers
deleted file mode 100644
index 1e21757118d7e..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: scriptnonce-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'nonce-noncynonce' 'nonce-noncy+/nonce='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html.sub.headers
deleted file mode 100644
index afa33e6df184d..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: scriptnonce-and-scripthash={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'sha256-LS8v1E1Ff0Hc8FobgWKNKY3sbW4rljPlZNQHyyutfKU=' 'nonce-nonceynonce'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html.sub.headers
deleted file mode 100644
index ee4e8b3f0b2c6..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: scriptnonce-basic-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'nonce-noncynonce'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html.sub.headers
deleted file mode 100644
index 9aecb94d30a63..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: scriptnonce-ignore-unsafeinline={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'nonce-noncynonce' 'nonce-noncy+/nonce=' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html.sub.headers
deleted file mode 100644
index 8d71f88d55e3c..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: scriptnonce-redirect={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'nonce-noncynonce'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html
deleted file mode 100644
index 82cad034796f8..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>securitypolicyviolation-block-cross-origin-image-from-script</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    <script>
-        var x = document.createElement('script');
-        x.src = 'http://{{host}}:{{ports[http][0]}}/content-security-policy/support/inject-image.js';
-        document.body.appendChild(x);
-
-    </script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=img-src%20&apos;none&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html.sub.headers
deleted file mode 100644
index 723ed281ffc86..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image-from-script.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: securitypolicyviolation-block-cross-origin-image-from-script={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html
deleted file mode 100644
index 9b7dc32e1bd21..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>securitypolicyviolation-block-cross-origin-image</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    <script>
-        var img = document.createElement('img');
-        img.src = 'http://{{host}}:{{ports[http][0]}}/security/resources/abe.png';
-        document.body.appendChild(img);
-        log("TEST COMPLETE");
-
-    </script>
-    <p>Check that a SecurityPolicyViolationEvent strips detail from cross-origin blocked URLs.</p>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=img-src%20&apos;none&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html.sub.headers
deleted file mode 100644
index d701a476fa4ca..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-cross-origin-image.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: securitypolicyviolation-block-cross-origin-image={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html
deleted file mode 100644
index 33facfbc3a8f6..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>securitypolicyviolation-block-image-from-script</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    <script>
-        var script = document.createElement('script');
-        script.src = '../support/inject-image.js';
-        document.body.appendChild(script);
-        log("TEST COMPLETE");
-
-    </script>
-    <p>Check that a SecurityPolicyViolationEvent is fired upon blocking an image injected via script.</p>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=img-src%20&apos;none&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html.sub.headers
deleted file mode 100644
index 6b6084dc531f1..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image-from-script.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: securitypolicyviolation-block-image-from-script={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html
deleted file mode 100644
index 3e62e2d359f5a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>securitypolicyviolation-block-image</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    <script>
-        var img = document.createElement('img');
-        img.src = '../support/fail.png';
-        img.onerror = function() {
-            log("TEST COMPLETE");
-        };
-        img.onload = function() {
-            log("FAIL");
-        };
-        document.body.appendChild(img);
-
-    </script>
-    <p>Check that a SecurityPolicyViolationEvent is fired upon blocking an image.</p>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=img-src%20&apos;none&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html.sub.headers
deleted file mode 100644
index 1f4f845784592..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/securitypolicyviolation-block-image.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: securitypolicyviolation-block-image={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.sub.headers
deleted file mode 100644
index 2b519e85ec247..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: stylehash-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: style-src 'self' 'sha256-pAKi9r4/WB7fHydbE3F3t8i8602ij2JN8zHJpL2T5BM=' 'sha256-hndjYvzUzy2Ykuad81Cwsl1FOXX/qYs/aDVyUyNZwBw=' 'sha384-bSVm1i3sjPBRM4TwZtYTDjk9JxZMExYHWbFmP1SxDhJH4ue0Wu9OPOkY5hcqRcSt' 'sha512-440MmBLtj9Kp5Bqloogn9BqGDylY8vFsv5/zXL1zH2fJVssCoskRig4gyM+9KqwvCSapSz5CVoUGHQcxv43UQg=='; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html.sub.headers
deleted file mode 100644
index ac9ca4e870ca7..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: stylehash-basic-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: style-src 'self' 'sha1-pfeR5wMA6np45oqDTP6Pj3tLpJo='; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-default-src.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-default-src.sub.html.sub.headers
deleted file mode 100644
index 8efe9d965efb5..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-default-src.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: stylehash-default-src={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: default-src 'self' 'sha256-SXMrww9+PS7ymkxYbv91id+HfXeO7p1uCY0xhNb4MIw='; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html.sub.headers
deleted file mode 100644
index 7475be89dc84e..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: stylenonce-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: style-src 'self' 'nonce-noncynonce' 'nonce-noncy+/nonce='; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html.sub.headers
deleted file mode 100644
index e51a02dd0bee9..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: stylenonce-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: style-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html.sub.headers
deleted file mode 100644
index cbfc8d4e47a08..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: blob-urls-do-not-match-self={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; child-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-match-blob.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-match-blob.sub.html.sub.headers
deleted file mode 100644
index be74e61a78bf1..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-match-blob.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: blob-urls-match-blob={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' blob:; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html.sub.headers
deleted file mode 100644
index b1f0e7f012de0..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: combine-header-and-meta-policies={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; style-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-multiple-header-policies.html.asis b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-multiple-header-policies.html.asis
deleted file mode 100644
index a14be5cd9ffc0..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-multiple-header-policies.html.asis
+++ /dev/null
@@ -1,60 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/html
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: combine-multiple-policies=d0140e7d-3800-4842-b66d-370840a4569a; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; style-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID=d0140e7d-3800-4842-b66d-370840a4569a
-Content-Security-Policy: img-src 'none'
-
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <meta http-equiv="Content-Security-Policy" content="img-src 'none'">
-    <title>combine-multiple-policies</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing multiple policies:
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; styls-src 'self'
-Content-Security-Policy: img-src 'none'
--->
-</head>
-
-<body>
-    This test checks that we enforce all the supplied policies. This test passe if it doesn&apos;t alert fail and if the style doesn&apos;t apply.
-    Check that a SecurityPolicyViolationEvent is fired upon blocking an image.
-    <script>
-        var img = document.createElement('img');
-        img.src = '../support/fail.png';
-        img.onerror = function() {
-            log("TEST COMPLETE");
-        };
-        img.onload = function() {
-            log("FAIL");
-        };
-        document.body.appendChild(img);
-
-    </script>
-    <style>
-        body {
-            background-color: blue;
-        }
-
-    </style>
-    <script>
-        var el = document.querySelector('body');
-        test(function() {
-            assert_equals(window.getComputedStyle(el).color, "rgb(0, 0, 0)")
-        });
-
-    </script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=style-src%20&apos;self&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html.sub.headers
deleted file mode 100644
index bd3eda40a862b..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-beacon-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html
deleted file mode 100644
index f68d3c384db51..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>connect-src-beacon-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["Pass"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';
--->
-</head>
-
-<body>
-    <script>
-       if (typeof navigator.sendBeacon != 'function') {
-            t_log.set_status(t_log.NOTRUN, "No navigator.sendBeacon, cannot run test.");
-            t_log.phase = t_log.phases.HAS_RESULT;
-            t_log.done();
-        } else {
-	    try {
-	    var es = navigator.sendBeacon("http://www1.{{host}}:{{ports[http][0]}}/security/contentSecurityPolicy/echo-report.php");
-         	log("Pass");
-            } catch (e) {
-            	log("Fail");
-            }
-            var report =  document.createElement("script");
-            report.src = "../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;";
-            report.async = true;
-            report.defer = true;
-            document.body.appendChild(report);
-	}
-
-    </script>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html.sub.headers
deleted file mode 100644
index 69ded8da7fbf6..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-beacon-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self'; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html.sub.headers
deleted file mode 100644
index 2c69d0dc866eb..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-beacon-redirect-to-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self'; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html.sub.headers
deleted file mode 100644
index eff5c546a8f8f..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-eventsource-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html
deleted file mode 100644
index 5be570c46fc05..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>connect-src-eventsource-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["Pass"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-connect-src 'self'; script-src 'self' 'unsafe-inline';
--->
-</head>
-
-<body>
-    <script>
-        try {
-            var es = new EventSource("http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/simple-event-stream");
-            // Firefox doesn't throw an exception and takes some time to close async
-            if (es.readyState == EventSource.CONNECTING) {
-                setTimeout( function() {
-                    es.readyState != EventSource.CLOSED ? log("Fail") : log("Pass");
-                }, 2);
-            } else if (es.readyState == EventSource.CLOSED) {
-                log("Pass");
-            } else {
-                log("Fail");
-            }
-
-        } catch (e) {
-            log("Pass");
-        }
-
-    </script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html.sub.headers
deleted file mode 100644
index ac37816a43941..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-eventsource-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self'; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html.sub.headers
deleted file mode 100644
index c63c8a9dea0f0..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-eventsource-redirect-to-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self' http://{{host}}:{{ports[http][0]}}/security/contentSecurityPolicy/resources/redir.php; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html.sub.headers
deleted file mode 100644
index 707435174f767..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-websocket-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self' ws://127.0.0.1:8880; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html.sub.headers
deleted file mode 100644
index 69036f5bdde48..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-websocket-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self' ws://127.0.0.1:8880; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html.sub.headers
deleted file mode 100644
index dbabcad7a02ac..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-xmlhttprequest-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html
deleted file mode 100644
index 014bb21aed3d1..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>connect-src-xmlhttprequest-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["Pass"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-connect-src 'self'; script-src 'self' 'unsafe-inline';
--->
-</head>
-
-<body>
-    <script>
-        try {
-            var xhr = new XMLHttpRequest;
-            xhr.open("GET", "http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.png", true);
-            xhr.send();
-            xhr.onload = function() {
-                log("Fail");
-            }
-            xhr.onerror = function() {
-                log("Pass");
-            }
-        } catch (e) {
-            log("Pass");
-        }
-
-    </script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html.sub.headers
deleted file mode 100644
index d338034cfc136..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-xmlhttprequest-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self'; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.sub.headers
deleted file mode 100644
index 452104ecd8ea0..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: connect-src-xmlhttprequest-redirect-to-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self'; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-allowed.sub.html.sub.headers
deleted file mode 100644
index f223f0661766a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: default-src-inline-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: default-src 'self' about: 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-blocked.sub.html
deleted file mode 100644
index ad66a9d1f4479..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-blocked.sub.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>default-src-inline-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- enforcing policy:
-default-src 'self'; connect-src 'self';
--->
-</head>
-
-<body>
-    This test passes if the inline scripts don't create failing tests and a CSP report is sent.
-    <script>
-        test(function() {
-            assert_unreached('FAIL inline script ran')
-        });
-
-    </script>
-    <script src="resources/document-write-alert-fail.js"></script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=default-src%20&apos;self&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-blocked.sub.html.sub.headers
deleted file mode 100644
index 63ea706f955bd..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: default-src-inline-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: default-src 'self'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/duplicate-directive.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/duplicate-directive.sub.html.sub.headers
deleted file mode 100644
index eefd7197f0fb0..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/duplicate-directive.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: duplicate-directive={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline'; script-src 'none'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-allowed.sub.html.sub.headers
deleted file mode 100644
index 6bf55a116eafe..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: eval-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline' 'unsafe-eval'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html.sub.headers
deleted file mode 100644
index f197e41de3ad7..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: eval-blocked-and-sends-report={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html
deleted file mode 100644
index 449f9d1927b7f..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<iframe src="about:blank"></iframe>
-Eval should be blocked in the iframe, but inline script should be allowed.
-<script>
-    window.onload = function() {
-        frames[0].log("<script>alert_assert(/PASS/); eval('alert_assert(/FAIL/);');<\/script>");
-        frames[0].document.close();
-    }
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html.sub.headers
deleted file mode 100644
index 224f25ba7b58e..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-in-about-blank-iframe.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: eval-blocked-in-about-blank-iframe={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked.sub.html.sub.headers
deleted file mode 100644
index 124f56bfad3be..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: eval-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html
deleted file mode 100644
index 66fa95d31e28c..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>eval-scripts-setInterval-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS 1 of 2","PASS 2 of 2"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';
--->
-</head>
-<pre>
-<script>
- {
-}
-var id_string = setInterval("clearInterval(id_string); alert_assert('PASS 1 of 2')", 0);
-if (id_string == 0)
-    log('FAIL: Return value for string (should not be 0): ' + id_string);
-var id_function = setInterval(function() {
-  clearInterval(id_function);
-  alert_assert('PASS 2 of 2');
-}, 0);
-if (id_function == 0)
-    document.write('FAIL: Return value for function (should not be 0): ' + id_function);
-</script>
-</pre>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html.sub.headers
deleted file mode 100644
index f13ba4c644e28..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: eval-scripts-setInterval-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline' 'unsafe-eval'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html
deleted file mode 100644
index 45d873c8027e4..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>eval-scripts-setInterval-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-<pre>
-<script>
- {
-}
-var id = setInterval("alert_assert('FAIL')", 0);
-if (id != 0)
-    log('FAIL: Return value for string (should be 0): ' + id);
-var id = setInterval(function() {
-  clearInterval(id);
-  alert_assert('PASS');
-}, 0);
-if (id == 0)
-    document.write('FAIL: Return value for function (should not be 0): ' + id);
-</script>
-</pre>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html.sub.headers
deleted file mode 100644
index 1bd6b636db1b9..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setInterval-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: eval-scripts-setInterval-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html
deleted file mode 100644
index 9b2e595e5d47a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>eval-scripts-setTimeout-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS 1 of 2","PASS 2 of 2"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';
--->
-</head>
-<pre>
-<script>
- {
-}
-var id = setTimeout("alert_assert('PASS 1 of 2')", 0);
-if (id == 0)
-    log('FAIL: Return value for string (should not be 0): ' + id);
-var id = setTimeout(function() {
-  alert_assert('PASS 2 of 2');
-}, 0);
-if (id == 0)
-    document.write('FAIL: Return value for function (should not be 0): ' + id);
-</script>
-</pre>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html.sub.headers
deleted file mode 100644
index 4d664d600b935..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: eval-scripts-setTimeout-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline' 'unsafe-eval'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html
deleted file mode 100644
index 72ed2ce1a3765..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>eval-scripts-setTimeout-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-<pre>
-<script>
- {
-}
-var id = setTimeout("alert_assert('FAIL')", 0);
-if (id != 0)
-    log('FAIL: Return value for string (should be 0): ' + id);
-var id = setTimeout(function() {
-  alert_assert('PASS');
-}, 0);
-if (id == 0)
-    document.write('FAIL: Return value for function (should not be 0): ' + id);
-</script>
-</pre>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html.sub.headers
deleted file mode 100644
index 81537fe3ebb37..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-scripts-setTimeout-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: eval-scripts-setTimeout-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html.sub.headers
deleted file mode 100644
index a68e2a3df3ba2..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: filesystem-urls-do-not-match-self={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html.sub.headers
deleted file mode 100644
index f9956ede82886..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: filesystem-urls-match-filesystem={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' filesystem:; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html.sub.headers
deleted file mode 100644
index ba1169956a31e..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: frame-src-about-blank-allowed-by-default={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: frame-src 'none'; object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html.sub.headers
deleted file mode 100644
index e23b82a937ba2..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: frame-src-about-blank-allowed-by-scheme={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: frame-src about:; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-allowed.sub.html.sub.headers
deleted file mode 100644
index 05247b4024d08..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: frame-src-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: frame-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-blocked.sub.html.sub.headers
deleted file mode 100644
index bd0e6d17f3230..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: frame-src-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: frame-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html.sub.headers
deleted file mode 100644
index 0970bbebf3a55..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: frame-src-cross-origin-load={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: frame-src 'self' http://www1.{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-allowed.sub.html
deleted file mode 100644
index 92cd088c52f51..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-allowed.sub.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>function-constructor-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';
--->
-</head>
-
-<body>
-    <script>
-        (new Function("alert_assert('PASS')"))();
-
-    </script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-allowed.sub.html.sub.headers
deleted file mode 100644
index dd80ebaccb446..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: function-constructor-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline' 'unsafe-eval'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-blocked.sub.html.sub.headers
deleted file mode 100644
index eb7da39cb91b6..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: function-constructor-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-allowed.sub.html
deleted file mode 100644
index 8bacdd3059441..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-allowed.sub.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-    {}
-
-    function createLink(rel, src) {
-        var link = document.createElement('link');
-        link.rel = rel;
-        link.href = src;
-        document.head.appendChild(link);
-    }
-    window.addEventListener('DOMContentLoaded', function() {
-        createLink('icon', 'http://localhost/foo?q=from_icon'); {}
-    });
-
-</script>
-<p>Use callbacks to show that favicons are loaded as allowed by CSP when link tags are dynamically added to the page.</p>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-allowed.sub.html.sub.headers
deleted file mode 100644
index b7d557b52ed3b..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: icon-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: img-src http://localhost; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-blocked.sub.html
deleted file mode 100644
index 978f25f63d1b8..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-blocked.sub.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-    function createLink(rel, src) {
-        var link = document.createElement('link');
-        link.rel = rel;
-        link.href = src;
-        document.head.appendChild(link);
-    }
-    window.addEventListener('DOMContentLoaded', function() {
-        createLink('icon', 'http://localhost/foo?q=from_icon'); {}
-    });
-
-</script>
-<p>Use callbacks to show that favicons are not loaded in violation of CSP when link tags are dynamically added to the page.</p>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-blocked.sub.html.sub.headers
deleted file mode 100644
index c4dc69985cac1..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/icon-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: icon-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/iframe-inside-csp.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/iframe-inside-csp.sub.html
deleted file mode 100644
index f3d1e14241514..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/iframe-inside-csp.sub.html
+++ /dev/null
@@ -1 +0,0 @@
-<iframe src="resources/sandboxed-eval.php"></iframe>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/iframe-inside-csp.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/iframe-inside-csp.sub.html.sub.headers
deleted file mode 100644
index 2cb1c72149c8c..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/iframe-inside-csp.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: iframe-inside-csp={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'self'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-allowed.sub.html
deleted file mode 100644
index c087692db9ab1..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-allowed.sub.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>image-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS"]'></script>
-    <!-- enforcing policy:
-img-src *; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    <img src="../support/pass.png" onload="alert_assert(this.width == 168 ? 'PASS' : 'FAIL')">
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-allowed.sub.html.sub.headers
deleted file mode 100644
index 3b85fc689b2ba..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: image-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: img-src *; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-blocked.sub.html
deleted file mode 100644
index e572070ef6e38..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-blocked.sub.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>image-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS"]'></script>
-    <!-- enforcing policy:
-img-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    This test passes if it doesn&apos;t alert FAIL and does alert PASS.
-    <img src="../support/pass.png" onload='alert_assert("FAIL")' onerror='alert_assert("PASS")'>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=img-src%20&apos;none&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-blocked.sub.html.sub.headers
deleted file mode 100644
index c58bb88bb37a7..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: image-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html
deleted file mode 100644
index 6482654cdf3e4..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>image-full-host-wildcard-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS"]'></script>
-    <!-- enforcing policy:
-img-src http://*.{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    <img src="http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/pass.png" onload="alert_assert(this.width == 168 ? 'PASS' : 'FAIL')">
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html.sub.headers
deleted file mode 100644
index 0f384f0931d75..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/image-full-host-wildcard-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: image-full-host-wildcard-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: img-src http://*.{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html
deleted file mode 100644
index 8ec6fe4330399..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>injected-inline-script-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["Pass 1 of 2","Pass 2 of 2"]'></script>
-    <!-- enforcing policy:
-      script-src 'self' 'unsafe-inline'; connect-src 'self';
-    -->
-</head>
-
-<body>
-    <script src="resources/inject-script.js"></script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers
deleted file mode 100644
index 7f345392489c9..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: injected-inline-script-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html
deleted file mode 100644
index bee3f9abd5475..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>injected-inline-script-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- enforcing policy:
-script-src 'self'; connect-src 'self';
--->
-</head>
-
-<body>
-    <script src="resources/inject-script.js"></script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20'self'"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html.sub.headers
deleted file mode 100644
index e90dec673c0ec..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: injected-inline-script-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html.sub.headers
deleted file mode 100644
index 8a48dc2487bad..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: injected-inline-style-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html.sub.headers
deleted file mode 100644
index d3f0a5efb853c..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: injected-inline-style-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: style-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html.sub.headers
deleted file mode 100644
index 963fa17517576..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: inline-style-allowed-while-cloning-objects={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: style-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed.sub.html.sub.headers
deleted file mode 100644
index 8ff58f55f2c08..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: inline-style-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html.sub.headers
deleted file mode 100644
index 7d765e2b69829..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: inline-style-attribute-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html.sub.headers
deleted file mode 100644
index 0b1ec14c1dfdc..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: inline-style-attribute-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: style-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html.sub.headers
deleted file mode 100644
index 66bf93faa1c25..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: inline-style-attribute-on-html={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-blocked.sub.html.sub.headers
deleted file mode 100644
index 0b83063268dd8..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: inline-style-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: style-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/manifest-src-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/manifest-src-allowed.sub.html.sub.headers
deleted file mode 100644
index 3fbdc7337c6d3..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/manifest-src-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: manifest-src-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: manifest-src *; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/manifest-src-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/manifest-src-blocked.sub.html.sub.headers
deleted file mode 100644
index 4d6e5e3956454..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/manifest-src-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: manifest-src-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: manifest-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-allowed.sub.html
deleted file mode 100644
index 4cb4002d9788b..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-allowed.sub.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<video></video>
-<script src="../../../media-resources/media-file.js"></script>
-<script src="../../../media-resources/video-test.js"></script>
-<script>
-    waitForEvent('loadedmetadata', function() {
-        alert_assert('PASS');
-        endTestLater();
-    });
-    // Find a supported media file.
-    var mediaFile = findMediaFile("video", "content/test");
-    var mimeType = mimeTypeForFile(mediaFile);
-    video.src = "http://{{host}}:{{ports[http][0]}}/resources/load-and-stall.cgi?name=../../../media/" + mediaFile + "&mimeType=" + mimeType + "&stallAt=100000";
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-allowed.sub.html.sub.headers
deleted file mode 100644
index b0401f7c76244..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: media-src http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-blocked.sub.html
deleted file mode 100644
index 57c8d5f650b29..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-blocked.sub.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<video></video>
-<script src="../../../media-resources/media-file.js"></script>
-<script src="../../../media-resources/video-test.js"></script>
-<p>This test passes if it doesn&apos;t alert failure.</p>
-<script>
-    waitForEvent('loadedmetadata', function() {
-        alert_assert('FAIL');
-    });
-    addEventListener('load', endTestLater, false);
-    // Find a supported media file.
-    var mediaFile = findMediaFile("video", "content/test");
-    var mimeType = mimeTypeForFile(mediaFile);
-    video.src = "http://{{host}}:{{ports[http][0]}}/resources/load-and-stall.cgi?name=../../../media/" + mediaFile + "&mimeType=" + mimeType + "&stallAt=100000";
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-blocked.sub.html.sub.headers
deleted file mode 100644
index 86c56953dbcd0..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: media-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-track-block.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-track-block.sub.html
deleted file mode 100644
index c8036ce174c77..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-track-block.sub.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>media-src-track-block</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS"]'></script>
-    <!-- enforcing policy:
-media-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-    <script>
-        function loaded() {
-            alert_assert("FAIL");
-        }
-
-        function errored() {
-            alert_assert("PASS");
-        }
-
-        function start() {
-            var track = document.querySelector('track');
-            track.track.mode = "hidden";
-            track.setAttribute('src', 'resources/track.vtt');
-        }
-
-    </script>
-</head>
-
-<body onload="start()">
-    <video>
-        <track kind="captions" onload="loaded()" onerror="errored()">
-    </video>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=media-src%20&apos;none&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-track-block.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-track-block.sub.html.sub.headers
deleted file mode 100644
index 85c496e74f32e..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/media-src-track-block.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-track-block={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: media-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html
deleted file mode 100644
index 358b7af1a7e38..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>object-in-svg-foreignobject</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    <p>This test ensures that objects inside SVG foreignobject elements are beholden to the same policy as the rest of the document. This test passes if there i a CSP violation saying the plugin was blocked.</p>
-    <svg>
-        <foreignobject>
-            <object xmlns="http://www.w3.org/1999/xhtml" data="/plugins/resources/mock-plugin.pl">
-            </object>
-        </foreignobject>
-    </svg>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=object-src%20&apos;none&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html.sub.headers
deleted file mode 100644
index a196a15589e6a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-in-svg-foreignobject.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: object-in-svg-foreignobject={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html
deleted file mode 100644
index 2e2bef25d3e6d..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>object-src-no-url-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-object-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    This test passes if there isn&apos;t a CSP violation saying the plugin was blocked.
-    <object type="application/x-webkit-test-netscape"></object>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html.sub.headers
deleted file mode 100644
index 3746103fe4ad1..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: object-src-no-url-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: object-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html.sub.headers
deleted file mode 100644
index dba0ece704a4a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: object-src-no-url-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-allowed.sub.html
deleted file mode 100644
index dace2c417d6a8..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-allowed.sub.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>object-src-url-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-object-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    This test passes if there is no CSP violation saying the plugin was blocked.
-    <object data="/content-security-policy/support/pass.png"></object>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-allowed.sub.html.sub.headers
deleted file mode 100644
index bce19c1defcc7..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: object-src-url-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: object-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-blocked.sub.html
deleted file mode 100644
index 4f12d747b012a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-blocked.sub.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>object-src-url-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    This test passes if there is a CSP violation saying the plugin was blocked.
-    <object data="/plugins/resources/mock-plugin.pl"></object>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=object-src%20&apos;none&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-blocked.sub.html.sub.headers
deleted file mode 100644
index 1447fd0fce217..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-url-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: object-src-url-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html
deleted file mode 100644
index a43e4be27c209..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html
+++ /dev/null
@@ -1 +0,0 @@
-<iframe src="resources/alert-pass.html"></iframe>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html.sub.headers
deleted file mode 100644
index ff37e37ee6f2f..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/policy-does-not-affect-child.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: policy-does-not-affect-child={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'self'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-blocked-data-uri.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-blocked-data-uri.sub.html.sub.headers
deleted file mode 100644
index 8530a1cc4a1df..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-blocked-data-uri.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: report-blocked-data-uri={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html
deleted file mode 100644
index ed2cd2a742d0a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>report-cross-origin-no-cookies</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-img-src 'none'; report-uri http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/report.py?op=put&reportID=; script-src 'self' 'unsafe-inline' http://www1.{{host}}:{{ports[http][0]}}; connect-src 'self';
--->
-    <script src="http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/set-cookie.js"></script>
-</head>
-
-<body>
-    <!-- This image will generate a CSP violation report. -->
-    <img src="resources/abe.png">
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=img-src%20&apos;none&apos;&amp;noCookies=true"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html.sub.headers
deleted file mode 100644
index 5a71229752e21..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-cross-origin-no-cookies.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: report-cross-origin-no-cookies={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline' http://www1.{{host}}:{{ports[http][0]}}; connect-src 'self'; report-uri http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html
deleted file mode 100644
index cb001a220940d..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>report-disallowed-from-meta</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS"]'></script>
-    <!-- enforcing policy:
-img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-    <meta http-equiv="Content-Security-Policy" content="img-src 'none'; report-uri /content-security-policy/support/report.py?op=put&reportID=5ada7c32-1c46-4b79-a95f-af33fcf95f8e">
-</head>
-
-<body>
-    This image should be blocked, but should not show up in the violation report because meta policies MUST ignore report-uri.
-    <img src="../resources/abe.png" onerror="alert_assert('PASS')" onload="alert_assert('FAIL')">
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html
deleted file mode 100644
index e90cb066b069f..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>report-cross-origin-no-cookies</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-img-src 'none'; report-uri http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/report.py?op=put&reportID=; script-src 'self' 'unsafe-inline' http://www1.{{host}}:{{ports[http][0]}}; connect-src 'self';
--->
-    <script src="/content-security-policy/blink-contrib/resources/set-cookie.js"></script>
-</head>
-
-<body>
-    <!-- This image will generate a CSP violation report. -->
-    <img src="resources/abe.png">
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=img-src%20&apos;none&apos;&amp;noCookies=true"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html.sub.headers
deleted file mode 100644
index 4655de254823a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-same-origin-with-cookies.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: report-same-origin-with-cookies={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html
deleted file mode 100644
index cf3f72f1e7d34..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>report-uri-from-inline-javascript</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-img-src 'none'; report-uri resources/save-report.php?test=report-uri-from-inline-javascript.html; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    <script>
-        // This script block will trigger a violation report.
-        var i = document.createElement('img');
-        i.src = 'resources/abe.png';
-        document.body.appendChild(i);
-
-    </script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=img-src%20&apos;none&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html.sub.headers
deleted file mode 100644
index c37a9ff8d7342..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-inline-javascript.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: report-uri-from-inline-javascript={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-javascript.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-javascript.sub.html
deleted file mode 100644
index 790a75bdad3d1..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-javascript.sub.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>report-uri-from-javascript</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-img-src 'none'; report-uri resources/save-report.php?test=report-uri-from-javascript.html; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body>
-    <script src="resources/inject-image.js"></script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=img-src%20&apos;none&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-javascript.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-javascript.sub.html.sub.headers
deleted file mode 100644
index ed6560118b682..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-from-javascript.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: report-uri-from-javascript={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri.sub.html
deleted file mode 100644
index 9ffb835f2bf5c..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri.sub.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<script src="resources/report-test.js"></script>
-<script>
-    // This script block will trigger a violation report.
-    alert_assert('FAIL');
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri.sub.html.sub.headers
deleted file mode 100644
index 1416ea7f1d25a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: report-uri={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'self'; report-uri resources/save-report.php?test=report-uri.html; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-fail.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-fail.html
deleted file mode 100644
index c0fb8173d5066..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-fail.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-    alert('FAIL');
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-pass.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-pass.html
deleted file mode 100644
index 50e753d0d32cd..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-pass.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-    alert('PASS');
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/blue.css b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/blue.css
deleted file mode 100644
index 54aeecc12f56d..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/blue.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.target {
-    background-color: blue;
-}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/generate-csp-report.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/generate-csp-report.html
deleted file mode 100644
index 887f44f48b643..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/generate-csp-report.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<meta http-equiv="Content-Security-Policy" content="script-src 'self'; report-uri save-report.php?test=generate-csp-report.html">
-<script>
-    // This script block will trigger a violation report.
-    alert('FAIL');
-
-</script>
-<script src="go-to-echo-report.js"></script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/go-to-echo-report.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/go-to-echo-report.js
deleted file mode 100644
index 6dae030e009c4..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/go-to-echo-report.js
+++ /dev/null
@@ -1,7 +0,0 @@
-window.onload = function() {
-    var test = window.location.pathname.replace(/^.+\//, '');
-    var match = window.location.search.match(/^\?test=([^&]+)/);
-    if (match)
-        test = match[1];
-    window.location = "/security/contentSecurityPolicy/resources/echo-report.php?test=" + test;
-}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-image.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-image.js
deleted file mode 100644
index 1e1f93b394a4c..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-image.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// This script block will trigger a violation report.
-var i = document.createElement('img');
-i.src = '/security/resources/abe.png';
-document.body.appendChild(i);
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-script.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-script.js
deleted file mode 100644
index 15537198507a4..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-script.js
+++ /dev/null
@@ -1,5 +0,0 @@
-document.write("<script>alert_assert('Pass 1 of 2');</script>");
-
-var s = document.createElement('script');
-s.textContent = "alert_assert('Pass 2 of 2');";
-document.body.appendChild(s);
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/postmessage-fail.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/postmessage-fail.html
deleted file mode 100644
index a0308ad98b4c7..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/postmessage-fail.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-    window.parent.postMessage('FAIL', '*');
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/postmessage-pass.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/postmessage-pass.html
deleted file mode 100644
index 700167b5db84a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/postmessage-pass.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-    window.parent.postMessage('PASS', '*');
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/script.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/script.js
deleted file mode 100644
index 54eaf530c5909..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/script.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var result = document.getElementById("result");
-result.firstChild.nodeValue = result.attributes.getNamedItem("text").value;
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/set-cookie.js.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/set-cookie.js.sub.headers
deleted file mode 100644
index 1d5fbba178538..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/set-cookie.js.sub.headers
+++ /dev/null
@@ -1 +0,0 @@
-Set-Cookie: report-cookie=true
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/simple-event-stream b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/simple-event-stream
deleted file mode 100644
index e467657bcb230..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/simple-event-stream
+++ /dev/null
@@ -1 +0,0 @@
-data: hello
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/simple-event-stream.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/simple-event-stream.headers
deleted file mode 100644
index 9bb8badcad45a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/simple-event-stream.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/event-stream
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/track.vtt b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/track.vtt
deleted file mode 100644
index 365e9ae150ba4..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/track.vtt
+++ /dev/null
@@ -1 +0,0 @@
-Subtitles!
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html
deleted file mode 100644
index c755504b160ae..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-This test passes if it does alert pass.
-<iframe src="data:text/html,&lt;script&gt;alert_assert(&apos;PASS&apos;);&lt;/script&gt;"></iframe>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html.sub.headers
deleted file mode 100644
index 4c79457285e94..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts-subframe.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: sandbox-allow-scripts-subframe={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: sandbox allow-scripts; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html
deleted file mode 100644
index 3bdaa12ea9704..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-This test passes if it does alert pass.
-<script>
-    alert_assert('PASS');
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html.sub.headers
deleted file mode 100644
index b6df57d172312..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-allow-scripts.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: sandbox-allow-scripts={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: sandbox allow-scripts; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html
deleted file mode 100644
index 5ddccfaa30b84..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-This test passes if it doesn&apos;t alert fail.
-<iframe src="data:text/html,&lt;script&gt;alert_assert(&apos;FAIL&apos;);&lt;/script&gt;"></iframe>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html.sub.headers
deleted file mode 100644
index 5287112d6cb0f..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty-subframe.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: sandbox-empty-subframe={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: sandbox; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty.sub.html
deleted file mode 100644
index 4e04e9875c287..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty.sub.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-This test passes if it doesn&apos;t alert fail.
-<script>
-    alert_assert('FAIL');
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty.sub.html.sub.headers
deleted file mode 100644
index f7d31c9594210..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/sandbox-empty.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: sandbox-empty={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: sandbox; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html
deleted file mode 100644
index cf4aab2018933..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>script-src-overrides-default-src</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS 1 of 2","PASS 2 of 2"]'></script>
-    <!-- enforcing policy:
-default-src about:; script-src 'self' 'unsafe-inline' 'self' 'unsafe-inline'; connect-src 'self';
--->
-</head>
-
-<body onload="alert_assert(&apos;PASS 2 of 2&apos;)">
-    <script>
-        alert_assert('PASS 1 of 2');
-
-    </script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html.sub.headers
deleted file mode 100644
index 5d3456433f1e7..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/script-src-overrides-default-src.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-overrides-default-src={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: default-src about:; script-src 'self' 'unsafe-inline'; style-src 'self'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html.sub.headers
deleted file mode 100644
index 05843484b88aa..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: self-doesnt-match-blob={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self'; script-src 'self' 'unsafe-inline'; child-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html
deleted file mode 100644
index 17da111a84c33..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>shared-worker-connect-src-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["xhr allowed","TEST COMPLETE"]'></script>
-    <!-- enforcing policy:
-connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';
--->
-
-</head>
-
-<body>
-    <script>
-    if(typeof SharedWorker != 'function') {
-        t_alert.set_status(t_alert.NOTRUN, "No SharedWorker, cannot run test.");
-        t_alert.phase = t_alert.phases.HAS_RESULT;
- 	t_alert.done();
-    } else {
-        try {
-            var worker = new SharedWorker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-allowed.sub.js');
-            worker.port.onmessage = function(event) {
-                alert_assert(event.data);
-            };
-        } catch (e) {
-            alert_assert(e);
-        }
-        var report =  document.createElement("script");
-        report.src = "../support/checkReport.sub.js?reportExists=false";
-        report.async = true;
-        report.defer = true;
-        document.body.appendChild(report);
-    }
-
-    </script>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html.sub.headers
deleted file mode 100644
index eefff95c6715e..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: shared-worker-connect-src-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self' http://www1.{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html
deleted file mode 100644
index 63225bf275e5d..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>shared-worker-connect-src-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["xhr blocked","TEST COMPLETE"]'></script>
-    <!-- enforcing policy:
-connect-src *; script-src 'self' 'unsafe-inline';
--->
-
-</head>
-
-<body>
-    <p>This test loads a shared worker, delivered with its own
-    policy.  The worker should be blocked from making an XHR
-    as that policy specifies a connect-src 'none', though
-    this resource's policy is connect-src *.  No report
-    should be sent since the worker's policy doesn't specify
-    a report-uri.</p>
-    <script>
-    if(typeof SharedWorker != 'function') {
-        t_alert.set_status(t_alert.NOTRUN, "No SharedWorker, cannot run test.");
-        t_alert.phase = t_alert.phases.HAS_RESULT;
-        t_alert.done();
-    } else {
-        try {
-            var worker = new SharedWorker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js');
-            worker.port.onmessage = function(event) {
-                alert_assert(event.data);
-            };
-        } catch (e) {
-            alert_assert(e);
-        }
-        var report =  document.createElement("script");
-        report.src = "../support/checkReport.sub.js?reportExists=false";
-        report.async = true;
-        report.defer = true;
-        document.body.appendChild(report);
-    }
-
-
-    </script>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.sub.headers
deleted file mode 100644
index bb4fb4c90c6d3..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: shared-worker-connect-src-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src *; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html
deleted file mode 100644
index b60eccb9ba9bf..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>source-list-parsing-paths-03</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline' example.com/js/; connect-src 'self';
--->
-</head>
-
-<body>
-    <p>This test passes if the source expression does not throw an &quot;invalid source&quot; error.</p>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html.sub.headers
deleted file mode 100644
index 58e7a22df395a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/source-list-parsing-paths-03.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: source-list-parsing-paths-03={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-inline' example.com/js/; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html
deleted file mode 100644
index 50b76688fa372..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>srcdoc-doesnt-bypass-script-src</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/alertAssert.sub.js?alerts=%5B%5D"></script>
-    <!-- enforcing policy:
-script-src 'self'; connect-src 'self';
--->
-</head>
-
-<body>
-    This test passes if it doesn&apos;t alert fail.
-    <iframe srcdoc="&lt;script&gt;window.parent.alert_assert(&apos;FAIL&apos;)&lt;/script&gt;"></iframe>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;self&apos;"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html.sub.headers
deleted file mode 100644
index e2ffd11854bb5..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/srcdoc-doesnt-bypass-script-src.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: srcdoc-doesnt-bypass-script-src={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html.sub.headers
deleted file mode 100644
index 9f7db5b0f6f43..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: star-doesnt-match-blob={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self'; script-src 'self' 'unsafe-inline'; child-src *; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-allowed.sub.html.sub.headers
deleted file mode 100644
index cdf3945487990..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: style-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: style-src *; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-blocked.sub.html.sub.headers
deleted file mode 100644
index 54c3272a382db..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: style-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: style-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html
deleted file mode 100644
index 923149199a430..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>worker-connect-src-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["xhr allowed"]'></script>
-    <!-- enforcing policy:
-connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';
--->
-
-</head>
-
-<body>
-    <script>
-        try {
-            var worker = new Worker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/worker-make-xhr.sub.js');
-            worker.onmessage = function(event) {
-                alert_assert(event.data);
-            };
-        } catch (e) {
-            alert_assert(e);
-        }
-
-    </script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html.sub.headers
deleted file mode 100644
index 92ef91f0d8ea1..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: worker-connect-src-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self'; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.sub.headers
deleted file mode 100644
index e302aa84aa8ab..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: worker-connect-src-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src *; script-src 'self' 'unsafe-inline'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-eval-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-eval-blocked.sub.html.sub.headers
deleted file mode 100644
index 8964f80abad7b..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-eval-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: worker-eval-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-from-guid.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-from-guid.sub.html.sub.headers
deleted file mode 100644
index d94d31ace8ce3..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-from-guid.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: worker-from-guid={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: connect-src 'self'; script-src 'self' 'unsafe-inline' blob:; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html.sub.headers
deleted file mode 100644
index b012518ece474..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: worker-function-function-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html.sub.headers
deleted file mode 100644
index 04de51d1400a3..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: worker-importscripts-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-script-src.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-script-src.sub.html
deleted file mode 100644
index 9caf77224f9c8..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-script-src.sub.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>worker-script-src</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-
-</head>
-
-<body>
-    <script>
-        try {
-            var foo = new Worker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/post-message.js');
-            foo.onmessage = function(event) {
-                alert_assert("PASS");
-            };
-        } catch (e) {
-            alert_assert(e);
-        }
-
-    </script>
-    <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-script-src.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-script-src.sub.html.sub.headers
deleted file mode 100644
index 76e5a3ba20209..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-script-src.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: worker-script-src={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html.sub.headers
deleted file mode 100644
index fb6b3d0a254c1..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: worker-set-timeout-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'self' 'unsafe-eval'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/xsl-blocked-expected.png b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/xsl-blocked-expected.png
deleted file mode 100644
index b5daa8555e86c330eb2e5eccf67690d6e4128605..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2840
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>i0*Z)=h^hlA%@Ws$lH`ok<m}?oTm}nM
z<CIhb15-2e6hkA!q|`)%B=e-y<Ww`WMAH;A!{h|>|Gya+xK??(IEGZrd3)_3Cxe2(
z0fW;2bI+@CHK_=HxoK<6&CqbJQkH??gLE@1gMe`a1B2lxV>A#(Q^II27|jKvxnMLG
mjOK#TTripo=#mRIax<o|uQj=NxfR&dW$<+Mb6Mw<&;$U8AGjj`

diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/xsl-unaffected-by-style-src-1-expected.png b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/xsl-unaffected-by-style-src-1-expected.png
deleted file mode 100644
index b5daa8555e86c330eb2e5eccf67690d6e4128605..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2840
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>i0*Z)=h^hlA%@Ws$lH`ok<m}?oTm}nM
z<CIhb15-2e6hkA!q|`)%B=e-y<Ww`WMAH;A!{h|>|Gya+xK??(IEGZrd3)_3Cxe2(
z0fW;2bI+@CHK_=HxoK<6&CqbJQkH??gLE@1gMe`a1B2lxV>A#(Q^II27|jKvxnMLG
mjOK#TTripo=#mRIax<o|uQj=NxfR&dW$<+Mb6Mw<&;$U8AGjj`

diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blob/blob-urls-do-not-match-self.sub.html
similarity index 67%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/blob/blob-urls-do-not-match-self.sub.html
index 912a29e0b8687..1bf96df17c0ed 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-do-not-match-self.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/blob/blob-urls-do-not-match-self.sub.html
@@ -3,14 +3,12 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; child-src 'self';">
     <title>blob-urls-do-not-match-self</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline'; connect-src 'self'; child-src 'self';
--->
+    <script src='../support/logTest.sub.js?logs=["violated-directive=script-src"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
 </head>
 
 <body>
@@ -18,6 +16,9 @@
         blob: URLs are same-origin with the page in which they were created, but explicitly do not match the &apos;self&apos; or '*' source in CSP directives because they are more akin to 'unsafe-inline' content.
     </p>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
         function fail() {
             alert_assert("FAIL!");
         }
@@ -30,7 +31,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;self&apos;%20&apos;unsafe-inline&apos;%20&apos;&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-match-blob.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blob/blob-urls-match-blob.sub.html
similarity index 80%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-match-blob.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/blob/blob-urls-match-blob.sub.html
index 819c1a699f2f6..41b06b302479e 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/blob-urls-match-blob.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/blob/blob-urls-match-blob.sub.html
@@ -3,14 +3,12 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' blob:; connect-src 'self';">    
     <title>blob-urls-match-blob</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS (1/1)"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' blob:; connect-src 'self';
--->
 </head>
 
 <body>
@@ -18,6 +16,10 @@
         blob: URLs are same-origin with the page in which they were created, but match only if the blob: scheme is specified.
     </p>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("FAIL");
+        });
+    
         function pass() {
             log("PASS (1/1)");
         }
@@ -30,7 +32,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blob/self-doesnt-match-blob.sub.html
similarity index 68%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/blob/self-doesnt-match-blob.sub.html
index 5f388622c4172..48ad34dbe8862 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/blob/self-doesnt-match-blob.sub.html
@@ -3,15 +3,12 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline'; child-src 'self';">
     <title>worker-connect-src-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["TEST COMPLETE"]'></script>
-    <!-- enforcing policy:
-connect-src 'self'; script-src 'self' 'unsafe-inline'; child-src 'self';
--->
-
+    <script src='../support/logTest.sub.js?logs=["violated-directive=worker-src","TEST COMPLETE"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
 </head>
 <p>This test loads a worker, from a guid.
     The worker should be blocked from loading with a child-src policy of 'self'
@@ -20,6 +17,10 @@
     with this resource.</p>
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+    
         try {
             var blob = new Blob([
                 "postMessage('FAIL');" +
@@ -32,18 +33,17 @@
                 alert_assert(event.data);
             };
             worker.onerror = function(event) {
-                alert_assert('TEST COMPLETE');
+                log('TEST COMPLETE');
                 event.preventDefault();
             }
         } catch (e) {
-            alert_assert('TEST COMPLETE');
+            log('TEST COMPLETE');
         }
         function timeout() {
-            alert_assert('TEST COMPLETE');
+            log('TEST COMPLETE');
         }
     </script>
     <div id="log"></div>
-     <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=child-src%20&apos;self&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blob/star-doesnt-match-blob.sub.html
similarity index 66%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/blob/star-doesnt-match-blob.sub.html
index fac12b52a65a5..0a184a84974e0 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/star-doesnt-match-blob.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/blob/star-doesnt-match-blob.sub.html
@@ -3,14 +3,11 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline'; child-src *;">
     <title>worker-connect-src-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["TEST COMPLETE"]'></script>
-    <!-- enforcing policy:
-connect-src 'self'; script-src 'self' 'unsafe-inline'; child-src *;
--->
+    <script src='../support/logTest.sub.js?logs=["violated-directive=worker-src","TEST COMPLETE"]'></script>
 
 </head>
 <p>This test loads a worker, from a guid.
@@ -20,6 +17,10 @@
     with this resource.</p>
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+    
         try {
             var blob = new Blob([
                 "postMessage('FAIL');" +
@@ -29,21 +30,20 @@
             var url = URL.createObjectURL(blob);
             var worker = new Worker(url);
             worker.onmessage = function(event) {
-                alert_assert(event.data);
+                log(event.data);
             };
             worker.onerror = function(event) {
                 event.preventDefault();
-                alert_assert('TEST COMPLETE');
+                log('TEST COMPLETE');
             }
         } catch (e) {
-            alert_assert('TEST COMPLETE');
+            log('TEST COMPLETE');
         }
         function timeout() {
-            alert_assert('TEST COMPLETE');
+            log('TEST COMPLETE');
         }
     </script>
     <div id="log"></div>
-     <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=child-src%20&apos;self&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html
index cf39bcdd5b349..0e48be6732003 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html
@@ -3,22 +3,27 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="child-src 'none'; object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>child-src-about-blank-allowed-by-default</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-
-    <!-- enforcing policy:
-child-src 'none'; object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <p>These frames should not be blocked by Content-Security-Policy.
         It&apos;s pointless to block about:blank iframes because
         blocking a frame just results in displaying about:blank anyway!
     </p>
+    <script>
+        var t = async_test("Check that frames load without throwing any violation events");
+        window.addEventListener("securitypolicyviolation", t.unreached_func("Should not have fired any events"));
+    </script>
+   
     <iframe src="about:blank"></iframe>
     <object type="text/html" data="about:blank"></object>
 
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
+    
+    <script>
+        t.done();
+    </script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html.sub.headers
deleted file mode 100644
index 68b2fb2fb8985..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: child-src-about-blank-allowed-by-default={{$id:uuid()}}; Path=/content-security-policy/child-src
-Content-Security-Policy: child-src 'none'; object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html
index d94eff6843cae..89e8529c1720c 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html
@@ -3,18 +3,23 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="child-src about:; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>child-src-about-blank-allowed-by-scheme</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
- 
-    <!-- enforcing policy:
-child-src about:; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <p>This frame should not be blocked by Content-Security-Policy.
     </p>
+    <script>
+        var t = async_test("Check that frames load without throwing any violation events");
+        window.addEventListener("securitypolicyviolation", t.unreached_func("Should not have fired any events"));
+    </script>
+    
     <iframe src="about:blank"></iframe>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
+    
+    <script>
+        t.done();
+    </script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html.sub.headers
deleted file mode 100644
index 9ff84d67dd2da..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: child-src-about-blank-allowed-by-scheme={{$id:uuid()}}; Path=/content-security-policy/child-src
-Content-Security-Policy: child-src about:; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-allowed.sub.html
index 6fee98883da00..29ded4c486e3f 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-allowed.sub.html
@@ -3,6 +3,7 @@
 
 <head>
     <title>child-src-allowed</title>
+    <meta http-equiv="Content-Security-Policy" content="child-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event."]'></script>
@@ -10,6 +11,10 @@
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
+        
+        window.addEventListener("securitypolicyviolation", function(e) {
+            alert_assert("Fail");
+        });
 
         var t_alert = async_test('Expecting alerts: ["PASS"]');
         var expected_alerts = ["PASS"];
@@ -36,9 +41,6 @@
         }
 
     </script>
-    <!-- enforcing policy:
-Content-Security-Policy: child-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <p>
         This iframe should be allowed.
     </p>
@@ -57,7 +59,6 @@
 <body>
     <iframe src="/content-security-policy/support/postmessage-pass.html" onload="loadEvent()"></iframe>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-allowed.sub.html.sub.headers
deleted file mode 100644
index 7eb8d76f96083..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-allowed.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: child-src-allowed={{$id:uuid()}}; Path=/content-security-policy/child-src
-Content-Security-Policy: child-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-blocked.sub.html
index 3d14da43e00d7..6306539393132 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-blocked.sub.html
@@ -3,14 +3,19 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="child-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>child-src-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event."]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event.", "violated-directive=frame-src"]'></script>
     <script>
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
+        
+        window.addEventListener("securitypolicyviolation", function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
 
         function alert_assert(msg) {
             t_log.step(function() {
@@ -34,9 +39,6 @@
         }
 
     </script>
-    <!-- enforcing policy:
-child-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <p>
         IFrames blocked by CSP should generate a 'load', not 'error' event, regardless of blocked state. This means they appear to be normal cross-origin loads, thereby not leaking URL information directly to JS.
     </p>
@@ -55,7 +57,6 @@
 <body>
     <iframe src="/content-security-policy/support/postmessage-fail.html" onload="loadEvent()" onerror="log('FAIL')"></iframe>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=frame-src%20&apos;none&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-blocked.sub.html.sub.headers
deleted file mode 100644
index 961d18a7dd6ee..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: child-src-blocked={{$id:uuid()}}; Path=/content-security-policy/child-src
-Content-Security-Policy: child-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html
index d11b7a3af6b10..153caa0242201 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html
@@ -2,14 +2,19 @@
 <html>
 <head>
     <title>child-src-blocked</title>
+    <meta http-equiv="Content-Security-Policy" content="frame-src 'none'; child-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event."]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event.", "violated-directive=frame-src"]'></script>
     <script>
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
 
+        window.addEventListener("securitypolicyviolation", function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+
         function alert_assert(msg) {
             t_log.step(function() {
                 if (msg.match(/^FAIL/i)) {
@@ -55,7 +60,6 @@
 <body>
     <iframe src="/content-security-policy/support/postmessage-fail.html" onload="loadEvent()" onerror="log('FAIL')"></iframe>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=frame-src%20&apos;none&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html.sub.headers
deleted file mode 100644
index 9c3ce84263cd9..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: child-src-conflicting-frame-src={{$id:uuid()}}; Path=/content-security-policy/child-src
-Content-Security-Policy: frame-src 'none'; child-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html
index 81bb003d652eb..c67ec67385b91 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html
@@ -3,15 +3,20 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="child-src 'self' http://www1.{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>child-src-cross-origin-load</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event.","PASS IFrame %232 generated a load event.","PASS IFrame %233 generated a load event."]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event.","PASS IFrame %232 generated a load event.","PASS IFrame %233 generated a load event.", "violated-directive=frame-src"]'></script>
     <script>
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
 
+        window.addEventListener("securitypolicyviolation", function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+
         var t_alert = async_test('Expecting alerts: ["PASS","PASS"]');
         var expected_alerts = ["PASS", "PASS"];
 
@@ -62,7 +67,6 @@
     <iframe src="http://{{domains[www1]}}:{{ports[http][0]}}/content-security-policy/support/postmessage-pass.html" onload="loadEvent()"></iframe>
     <iframe src="http://{{domains[www2]}}:{{ports[http][0]}}/content-security-policy/support/postmessage-fail.html" onload="loadEvent()" onerror="log('FAIL')"></iframe>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=frame-src%20&apos;self&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html.sub.headers
deleted file mode 100644
index 53527c1adaf2e..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: child-src-cross-origin-load={{$id:uuid()}}; Path=/content-security-policy/child-src
-Content-Security-Policy: child-src 'self' http://www1.{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html
index 74b77c95d564d..6a39213290ce4 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html
@@ -3,15 +3,20 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="child-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>child-src-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event."]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event.", "violated-directive=frame-src"]'></script>
     <script>
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
 
+        window.addEventListener("securitypolicyviolation", function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+
         function alert_assert(msg) {
             t_log.step(function() {
                 if (msg.match(/^FAIL/i)) {
@@ -55,7 +60,6 @@
 <body>
     <iframe src="/common/redirect.py?location=http://{{domains[www1]}}:{{ports[http][0]}}/content-security-policy/support/postmessage-fail.html" onload="loadEvent()" onerror="log('FAIL')"></iframe>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=frame-src%20&apos;none&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html.sub.headers
deleted file mode 100644
index 60dac9bc498dc..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: child-src-redirect-blocked={{$id:uuid()}}; Path=/content-security-policy/child-src
-Content-Security-Policy: child-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html
similarity index 74%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html
index 2beb00d020c2a..a32913dd3e27b 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html
@@ -3,6 +3,7 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';">
     <title>connect-src-beacon-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -15,25 +16,22 @@
 
 <body>
     <script>
- 	if (typeof navigator.sendBeacon != 'function') {
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("FAIL");
+        });
+    
+ 	      if (typeof navigator.sendBeacon != 'function') {
             t_log.set_status(t_log.NOTRUN, "No navigator.sendBeacon, cannot run test.");
             t_log.phase = t_log.phases.HAS_RESULT;
             t_log.done();
         } else {
-	    try {
+	          try {
        	       var es = navigator.sendBeacon("http://{{host}}:{{ports[http][0]}}/cors/resources/status.py");
        	       log("Pass");
        	    } catch (e) {
        	       log("Fail");
        	    }
-            var report =  document.createElement("script");
-	    report.src = "../support/checkReport.sub.js?reportExists=false";
-	    report.async = true;
-            report.defer = true;
-	    document.body.appendChild(report);
-
-	}
-
+	      }
     </script>
     <div id="log"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html
index c7f7e383d26e3..95b4ce9a19116 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html
@@ -1,27 +1,39 @@
 <!DOCTYPE html>
-<meta http-equiv="Content-Security-Policy" content="connect-src 'self'">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-    async_test(t => {
-      document.addEventListener("securitypolicyviolation", t.step_func_done(e => {
-        if (e.blockedURI != "http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt")
-            return;
+<html>
 
-        assert_equals(e.violatedDirective, "connect-src");
-      }));
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline';"> 
+    <title>connect-src-beacon-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["Pass", "violated-directive=connect-src"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+    <!-- enforcing policy:
+connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';
+-->
+</head>
 
-      assert_true(navigator.sendBeacon("http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt"));
-    }, "sendBeacon should not throw.");
+<body>
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+       });
+       
+       if (typeof navigator.sendBeacon != 'function') {
+            t_log.set_status(t_log.NOTRUN, "No navigator.sendBeacon, cannot run test.");
+            t_log.phase = t_log.phases.HAS_RESULT;
+            t_log.done();
+       } else {
+	         try {
+	             var es = navigator.sendBeacon("http://www1.{{host}}:{{ports[http][0]}}/security/contentSecurityPolicy/echo-report.php");
+       	       log("Pass");
+           } catch (e) {
+               log("Fail");
+           }
+	     }
+    </script>
+    <div id="log"></div>
+</body>
 
-    async_test(t => {
-      document.addEventListener("securitypolicyviolation", t.step_func_done(e => {
-        if (e.blockedURI != "http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt")
-            return;
-
-        assert_equals(e.violatedDirective, "connect-src");
-      }));
-
-      assert_true(navigator.sendBeacon("common/redirect-opt-in.py?status=307&location=http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt"));
-    }, "redirect case");
-</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html
similarity index 57%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html
index 3d03100e366bb..7328d7a704a3b 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-beacon-redirect-to-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html
@@ -3,14 +3,12 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline';">
     <title>connect-src-beacon-redirect-to-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=connect-src"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-connect-src 'self'; script-src 'self' 'unsafe-inline';
--->
     <script></script>
 </head>
 
@@ -18,22 +16,19 @@
     <p>The beacon should not follow the redirect to http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.png and send a CSP violation report.</p>
     <p>Verify that a CSP connect-src directive blocks redirects.</p>
     <script>
-	if (typeof navigator.sendBeacon != 'function') {
-	    var t = async_test();
-            t.set_status(t.NOTRUN, "No navigator.sendBeacon, cannot run test.");
-            t.phase = t.phases.HAS_RESULT;
-            t.done();
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+       });
+       
+	     if (typeof navigator.sendBeacon != 'function') {
+	          t_log.set_status(t_log.NOTRUN, "No navigator.sendBeacon, cannot run test.");
+            t_log.phase = t_log.phases.HAS_RESULT;
+            t_log.done();
         } else {
             navigator.sendBeacon(
                 "/common/redirect.py?location=http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.png",
                 "ping");
-            var report =  document.createElement("script");
-            report.src = "../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;";
-            report.async = true;
-            report.defer = true;
-            document.body.appendChild(report);
         }
-
     </script>
     <div id="log"></div>
 </body>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-allowed.sub.html
similarity index 66%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-allowed.sub.html
index b3a65f1c102fa..3025e8a571a5d 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-allowed.sub.html
@@ -3,20 +3,22 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';">
     <title>connect-src-eventsource-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["Pass"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';
--->
 </head>
 
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("FAIL");
+        });
+    
         try {
-            var es = new EventSource("http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/simple-event-stream");
+            var es = new EventSource("http://{{host}}:{{ports[http][0]}}/content-security-policy/connect-src/resources/simple-event-stream");
             log("Pass");
         } catch (e) {
             log("Fail");
@@ -24,7 +26,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html
index 4e74f05099aaf..9b08365cec961 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html
@@ -1,61 +1,39 @@
 <!DOCTYPE html>
-<meta http-equiv="Content-Security-Policy" content="connect-src 'self'">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-    async_test(t => {
-      var errorEvent = false;
-      var cspEvent = false;
-
-      var es = new EventSource("http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt");
-      es.onerror = t.step_func(e => {
-        assert_equals(es.readyState, EventSource.CLOSED);
-
-        assert_false(errorEvent);
-        errorEvent = true;
-        if (cspEvent)
-            t.done();
-      });
-
-      document.addEventListener("securitypolicyviolation", t.step_func(e => {
-        if (e.blockedURI != "http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt")
-            return;
-
-        assert_equals(es.readyState, EventSource.CLOSED);
-        assert_equals(e.violatedDirective, "connect-src");
-
-        assert_false(cspEvent);
-        cspEvent = true;
-        if (errorEvent)
-            t.done();
-      }));
-    }, "EventSource should fire onerror.");
-
-    async_test(t => {
-      var errorEvent = false;
-      var cspEvent = false;
-
-      var es = new EventSource("http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt");
-      es.onerror = t.step_func(e => {
-        assert_equals(es.readyState, EventSource.CLOSED);
-
-        assert_false(errorEvent);
-        errorEvent = true;
-        if (cspEvent)
-            t.done();
-      });
-
-      document.addEventListener("securitypolicyviolation", t.step_func(e => {
-        if (e.blockedURI != "http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt")
-            return;
-
-        assert_equals(es.readyState, EventSource.CLOSED);
-        assert_equals(e.violatedDirective, "connect-src");
-
-        assert_false(cspEvent);
-        cspEvent = true;
-        if (errorEvent)
-            t.done();
-      }));
-    }, "EventSource should fire onerror.");
-
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline';">
+    <title>connect-src-eventsource-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["Pass","violated-directive=connect-src"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+    
+        try {
+            var es = new EventSource("http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/connect-src/resources/simple-event-stream");
+            // Firefox doesn't throw an exception and takes some time to close async
+            if (es.readyState == EventSource.CONNECTING) {
+                setTimeout( function() {
+                    es.readyState != EventSource.CLOSED ? log("Fail") : log("Pass");
+                }, 2);
+            } else if (es.readyState == EventSource.CLOSED) {
+                log("Pass");
+            } else {
+                log("Fail");
+            }
+        } catch (e) {
+            log("Pass");
+        }
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html
similarity index 65%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html
index a3ba4bad03a92..32709cd2d4acc 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html
@@ -3,22 +3,24 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self' http://{{host}}:{{ports[http][0]}}/security/contentSecurityPolicy/resources/redir.php; script-src 'self' 'unsafe-inline';">
     <title>connect-src-eventsource-redirect-to-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS EventSource() did not follow the disallowed redirect.","TEST COMPLETE"]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS EventSource() did not follow the disallowed redirect.","TEST COMPLETE", "violated-directive=connect-src"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-connect-src 'self'; script-src 'self' 'unsafe-inline';
--->
     <script></script>
 </head>
 
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+
         var es;
         try {
-            es = new EventSource("/common/redirect.py?location= http://www.{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/simple-event-stream");
+            es = new EventSource("/common/redirect.py?location= http://www.{{host}}:{{ports[http][0]}}/content-security-policy/connect-src/resources/simple-event-stream");
         } catch (e) {
             log("FAIL " + "EventSource() should not throw an exception.");
         }
@@ -33,7 +35,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;/security/contentSecurityPolicy/resources/redir.php"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html
similarity index 72%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html
index 4e8499bd42489..6216444e08ec3 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html
@@ -3,18 +3,20 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self' ws://127.0.0.1:8880; script-src 'self' 'unsafe-inline';">
     <title>connect-src-websocket-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["Pass"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-connect-src 'self' ws://127.0.0.1:8880; script-src 'self' 'unsafe-inline';
--->
 </head>
 
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+        
         try {
             var ws = new WebSocket("ws://127.0.0.1:8880/echo");
             log("Pass");
@@ -24,7 +26,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html
index cb8e0ec4c8ec4..249c7a346a4e2 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html
@@ -1,34 +1,31 @@
 <!DOCTYPE html>
-<meta http-equiv="Content-Security-Policy" content="connect-src 'self'">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-    async_test(t => {
-      var errorEvent = false;
-      var cspEvent = false;
+<html>
 
-      var ws = new WebSocket("ws://{{domains[www]}}:{{ports[ws][0]}}/echo");
-      ws.onopen = t.unreached_func("open should not fire.");
-      ws.onerror = t.step_func(e => {
-        assert_equals(ws.readyState, WebSocket.CLOSED);
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self' ws://127.0.0.1:8880; script-src 'self' 'unsafe-inline';">
+    <title>connect-src-websocket-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["Pass","violated-directive=connect-src"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
 
-        assert_false(errorEvent);
-        errorEvent = true;
-        if (cspEvent)
-            t.done();
-      });
+<body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
 
-      document.addEventListener("securitypolicyviolation", t.step_func(e => {
-        if (e.blockedURI != "ws://{{domains[www]}}:{{ports[ws][0]}}")
-            return;
+        try {
+            var ws = new WebSocket("ws://localhost:8880/echo");
+            log("Fail");
+        } catch (e) {
+            log("Pass");
+        }
 
-        assert_equals(ws.readyState, WebSocket.CLOSED);
-        assert_equals(e.violatedDirective, "connect-src");
+    </script>
+    <div id="log"></div>
+</body>
 
-        assert_false(cspEvent);
-        cspEvent = true;
-        if (errorEvent)
-            t.done();
-      }));
-    }, "WebSocket should fire error event.");
-</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-allowed.sub.html
similarity index 74%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-allowed.sub.html
index a2ad12186462f..bde5eeea10acb 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-allowed.sub.html
@@ -3,18 +3,20 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';">
     <title>connect-src-xmlhttprequest-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["Pass"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';
--->
 </head>
 
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+
         try {
             var xhr = new XMLHttpRequest;
             xhr.open("GET", "http://{{host}}:{{ports[http][0]}}/xmlhttprequest/resources/get.txt", true);
@@ -25,7 +27,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html
index 3e8f66c1a13d8..f4215909d9f50 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html
@@ -1,69 +1,38 @@
 <!DOCTYPE html>
-<meta http-equiv="Content-Security-Policy" content="connect-src 'self'">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-    async_test(t => {
-      var errorEvent = false;
-      var cspEvent = false;
-
-      var xhr = new XMLHttpRequest;
-      xhr.open("GET", "http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt");
-      xhr.onload = t.unreached_func("Load should not fire.");
-      xhr.onerror = t.step_func(e => {
-        assert_equals(xhr.readyState, XMLHttpRequest.DONE);
-
-        assert_false(errorEvent);
-        errorEvent = true;
-        if (cspEvent)
-            t.done();
-      });
-
-      document.addEventListener("securitypolicyviolation", t.step_func(e => {
-        if (e.blockedURI != "http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt")
-            return;
-
-        assert_equals(xhr.readyState, XMLHttpRequest.DONE);
-        assert_equals(e.violatedDirective, "connect-src");
-
-        assert_false(cspEvent);
-        cspEvent = true;
-        if (errorEvent)
-            t.done();
-      }));
-
-      xhr.send();
-    }, "XHR should fire onerror.");
-
-    async_test(t => {
-      var errorEvent = false;
-      var cspEvent = false;
-
-      var xhr = new XMLHttpRequest;
-      xhr.open("GET", "/common/redirect-opt-in.py?status=307&location=http://{{domains[www]}}:{{ports[http][0]}}/common/text-plain.txt");
-      xhr.onload = t.unreached_func("Load should not fire.");
-      xhr.onerror = t.step_func(e => {
-        assert_equals(xhr.readyState, XMLHttpRequest.DONE);
-
-        assert_false(errorEvent);
-        errorEvent = true;
-        if (cspEvent)
-            t.done();
-      });
-
-      document.addEventListener("securitypolicyviolation", t.step_func(e => {
-        if (e.blockedURI != "http://{{domains[www]}}:{{ports[http][0]}}")
-            return;
-
-        assert_equals(xhr.readyState, XMLHttpRequest.DONE);
-        assert_equals(e.violatedDirective, "connect-src");
-
-        assert_false(cspEvent);
-        cspEvent = true;
-        if (errorEvent)
-            t.done();
-      }));
-
-      xhr.send();
-    }, "XHR should fire onerror after a redirect.");
-</script>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline';">
+    <title>connect-src-xmlhttprequest-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["Pass","violated-directive=connect-src"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+
+        try {
+            var xhr = new XMLHttpRequest;
+            xhr.open("GET", "http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.png", true);
+            xhr.send();
+            xhr.onload = function() {
+                log("Fail");
+            }
+            xhr.onerror = function() {
+                log("Pass");
+            }
+        } catch (e) {
+            log("Pass");
+        }
+
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html
similarity index 82%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html
index 6fc0769b618e8..429e463c5314f 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html
@@ -3,19 +3,21 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline';">
     <title>connect-src-xmlhttprequest-redirect-to-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS XMLHttpRequest.send() did not follow the disallowed redirect.","TEST COMPLETE"]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS XMLHttpRequest.send() did not follow the disallowed redirect.","TEST COMPLETE","violated-directive=connect-src"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-connect-src 'self'; script-src 'self' 'unsafe-inline';
--->
     <script id="inject_here"></script>
 </head>
 
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+
         var xhr = new XMLHttpRequest;
         try {
             xhr.open("GET", "/common/redirect.py?location=http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.asis", true);
@@ -39,7 +41,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;/security/contentSecurityPolicy/resources/redir.php"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream b/tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream
new file mode 100644
index 0000000000000..bdd2d486c2679
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream
@@ -0,0 +1 @@
+data: hello
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream.headers b/tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream.headers
new file mode 100644
index 0000000000000..450c9f2d2381b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream.headers
@@ -0,0 +1 @@
+Content-Type: text/event-stream
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html
new file mode 100644
index 0000000000000..d8cec9ff13abf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self' http://{{domains[www1]}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';">
+    <title>shared-worker-connect-src-allowed</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["xhr allowed","TEST COMPLETE"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+
+<body>
+  <script>
+    window.addEventListener('securitypolicyviolation', function(e) {
+        log("violated-directive=" + e.violatedDirective);
+    });
+    
+    if(typeof SharedWorker != 'function') {
+        t_log.set_status(t_alert.NOTRUN, "No SharedWorker, cannot run test.");
+        t_log.phase = t_alert.phases.HAS_RESULT;
+      	t_log.done();
+    } else {
+        try {
+            var worker = new SharedWorker('/content-security-policy/connect-src/support/shared-worker-make-xhr-allowed.sub.js');
+            worker.port.onmessage = function(event) {
+                log(event.data);
+            };
+        } catch (e) {
+            log(e);
+        }
+    }
+
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html
new file mode 100644
index 0000000000000..2157bbc97799d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src *; script-src 'self' 'unsafe-inline';">
+    <title>shared-worker-connect-src-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["xhr blocked","TEST COMPLETE"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>    
+</head>
+
+<body>
+    <p>This test loads a shared worker, delivered with its own
+    policy.  The worker should be blocked from making an XHR
+    as that policy specifies a connect-src 'none', though
+    this resource's policy is connect-src *.  No report
+    should be sent since the worker's policy doesn't specify
+    a report-uri.</p>
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+       });
+    
+      if(typeof SharedWorker != 'function') {
+          t_log.set_status(t_log.NOTRUN, "No SharedWorker, cannot run test.");
+          t_log.phase = t_log.phases.HAS_RESULT;
+          t_log.done();
+      } else {
+          try {
+              var worker = new SharedWorker('/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js');
+              worker.port.onmessage = function(event) {
+                  log(event.data);
+              };
+          } catch (e) {
+              log(e);
+          }
+      }
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-allowed.sub.js b/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-allowed.sub.js
similarity index 80%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-allowed.sub.js
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-allowed.sub.js
index 28937d05dab9a..1e9700832d0e9 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-allowed.sub.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-allowed.sub.js
@@ -14,7 +14,7 @@ onconnect = function (event) {
         port.postMessage("TEST COMPLETE");
     };
     try {
-        xhr.open("GET", "/common/redirect.py?location=http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.asis", true);
+        xhr.open("GET", "http://{{domains[www1]}}:{{ports[http][0]}}/content-security-policy/support/fail.asis", true);
         xhr.send();
     } catch (e) {
         port.postMessage("xhr blocked");
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js b/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js
similarity index 80%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js
index 28937d05dab9a..1e9700832d0e9 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js
@@ -14,7 +14,7 @@ onconnect = function (event) {
         port.postMessage("TEST COMPLETE");
     };
     try {
-        xhr.open("GET", "/common/redirect.py?location=http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.asis", true);
+        xhr.open("GET", "http://{{domains[www1]}}:{{ports[http][0]}}/content-security-policy/support/fail.asis", true);
         xhr.send();
     } catch (e) {
         port.postMessage("xhr blocked");
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js.sub.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/shared-worker-make-xhr-blocked.sub.js.sub.headers
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js.sub.headers
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-make-xhr-blocked.sub.js b/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-make-xhr-blocked.sub.js
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-make-xhr-blocked.sub.js.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js.sub.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-make-xhr-blocked.sub.js.sub.headers
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js.sub.headers
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-make-xhr.sub.js b/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr.sub.js
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-make-xhr.sub.js
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr.sub.js
diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-allowed.sub.html
new file mode 100644
index 0000000000000..5a5e29f6684aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-allowed.sub.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline';">
+    <title>worker-connect-src-allowed</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["xhr allowed"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+
+</head>
+
+<body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('Fail');
+        });
+    
+        try {
+            var worker = new Worker('/content-security-policy/connect-src/support/worker-make-xhr.sub.js');
+            worker.onmessage = function(event) {
+                log(event.data);
+            };
+        } catch (e) {
+            log(e);
+        }
+
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-blocked.sub.html
similarity index 59%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-blocked.sub.html
index 0541322902d26..a0ff32b2d4ced 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-blocked.sub.html
@@ -3,15 +3,12 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src *; script-src 'self' 'unsafe-inline';">
     <title>worker-connect-src-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["xhr blocked","TEST COMPLETE"]'></script>
-    <!-- enforcing policy:
-connect-src *; script-src 'self' 'unsafe-inline';
--->
-
+    <script src='../support/logTest.sub.js?logs=["xhr blocked","TEST COMPLETE"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
 </head>
 <p>This test loads a worker, which is delivered with its own
     policy.  The worker should be blocked from making an XHR
@@ -21,18 +18,21 @@
     a report-uri.</p>
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('Fail');
+        });
+    
         try {
-            var worker = new Worker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/worker-make-xhr-blocked.sub.js');
+            var worker = new Worker('/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js');
             worker.onmessage = function(event) {
-                alert_assert(event.data);
+                log(event.data);
             };
         } catch (e) {
-            alert_assert(e);
+            log(e);
         }
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-from-guid.sub.html b/tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-from-guid.sub.html
similarity index 75%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-from-guid.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-from-guid.sub.html
index b290b82f64943..6f74e4ff3bf15 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-from-guid.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-from-guid.sub.html
@@ -3,15 +3,12 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline' blob:;">
     <title>worker-connect-src-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["xhr blocked","TEST COMPLETE"]'></script>
-    <!-- enforcing policy:
-connect-src 'self'; script-src 'self' 'unsafe-inline' blob:;
--->
-
+    <script src='../support/logTest.sub.js?logs=["violated-directive=connect-src","xhr blocked","TEST COMPLETE"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
 </head>
 <p>This test loads a worker, from a guid.
     The worker should be blocked from making an XHR
@@ -21,6 +18,9 @@
     with this resource.</p>
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
         try {
             var blob = new Blob([
                 "var xhr = new XMLHttpRequest;" +
@@ -39,7 +39,7 @@
                 "try { " +
                 "  xhr.open(" +
                 "   'GET'," +
-                "   'http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.asis'," + 
+                "   'http:///content-security-policy/support/fail.asis'," + 
                 "    true" +
                 "  );" +
                 "  xhr.send();" +
@@ -51,15 +51,14 @@
             var url = URL.createObjectURL(blob);
             var worker = new Worker(url);
             worker.onmessage = function(event) {
-                alert_assert(event.data);
+                log(event.data);
             };
         } catch (e) {
-            alert_assert(e);
+            log(e);
         }
 
     </script>
     <div id="log"></div>
-     <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20&apos;self&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-allowed.sub.html
similarity index 65%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-allowed.sub.html
index f5859087a29e2..8f9bd81d39574 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/default-src-inline-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-allowed.sub.html
@@ -3,14 +3,17 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("FAIL");
+        });
+    </script>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' about: 'unsafe-inline'; connect-src 'self';">
     <title>default-src-inline-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script src='../support/alertAssert.sub.js?alerts=["PASS 1 of 2","PASS 2 of 2"]'></script>
-    <!-- enforcing policy:
-default-src 'self' about: 'unsafe-inline'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body onload="alert_assert(&apos;PASS 2 of 2&apos;)">
@@ -18,9 +21,8 @@
         alert_assert('PASS 1 of 2');
 
     </script>
-    <!--iframe src="javascript:alert_assert(&apos;PASS 2 of 3&apos;)"></iframe-->
+    <!--iframe src="javascript:alert_assert(&apos;Fail&apos;)"></iframe-->
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-blocked.sub.html
new file mode 100644
index 0000000000000..86873553c6bd8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-blocked.sub.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+    </script>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; connect-src 'self';">
+    <title>default-src-inline-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=script-src","violated-directive=script-src"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+
+<body>
+    <p>This test passes if the inline scripts don't create failing tests and a CSP report is sent.</p>
+    <script>
+        test(function() {
+            assert_unreached('FAIL inline script ran')
+        });
+
+    </script>
+    <script src="../support/document-write-alert-fail.js"></script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-allowed.sub.html
similarity index 78%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-allowed.sub.html
index 19cf6811c57d9..418d6f51b0f4f 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-allowed.sub.html
@@ -3,15 +3,16 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>form-action-src-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS","TEST COMPLETE"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('Fail');
+        });
         window.addEventListener("message", function(event) {
             log(event.data);
         }, false);
@@ -28,13 +29,12 @@
 <body>
     <iframe name="test_target" id="test_iframe"></iframe>
 
-    <form action="/common/redirect.py?location=/content-security-policy/blink-contrib/resources/postmessage-pass.html" id="theform" method="post" target="test_target">
+    <form action="/common/redirect.py?location=/content-security-policy/support/postmessage-pass.html" id="theform" method="post" target="test_target">
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
     <p>Tests that allowed form actions work correctly.</p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
     </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-blocked.sub.html
similarity index 70%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-blocked.sub.html
index 0960a8a02f242..a113d9a2643ba 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-blocked.sub.html
@@ -3,15 +3,16 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="form-action 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>form-action-src-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=form-action","TEST COMPLETE"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-form-action 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('violated-directive=' + e.violatedDirective);
+        });
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
@@ -27,13 +28,12 @@
 
 <body>
     <iframe name="test_target" id="test_iframe"></iframe>
-    <form action="/common/redirect.py?location=/content-security-policy/blink-contrib/resources/postmessage-fail.html" id="theform" method="post" target="test_target">
+    <form action="/common/redirect.py?location=/content-security-policy/support/postmessage-fail.html" id="theform" method="post" target="test_target">
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
     <p>Tests that blocking form actions works correctly.</p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=form-action%20&apos;none&apos;"></script>
 
     </body>
 
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-default-ignored.sub.html
similarity index 76%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-default-ignored.sub.html
index 32823d6806fc9..58db5bf7355b3 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-default-ignored.sub.html
@@ -3,15 +3,16 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; style-src 'self'; frame-src 'self';">
     <title>form-action-src-default-ignored</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS","TEST COMPLETE"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-default-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; frame-src 'self';
--->
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('Fail');
+        });
         window.addEventListener("message", function(event) {
             log(event.data);
         }, false);
@@ -28,13 +29,12 @@
 <body>
     <iframe name="test_target" id="test_iframe"></iframe>
 
-    <form action="/common/redirect.py?location=/content-security-policy/blink-contrib/resources/postmessage-pass.html" id="theform" method="post" target="test_target">
+    <form action="/common/redirect.py?location=/content-security-policy/support/postmessage-pass.html" id="theform" method="post" target="test_target">
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
     <p>Tests that default-src does not cascade to form-action.</p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-get-allowed.sub.html
similarity index 73%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-get-allowed.sub.html
index a7d3e584b8373..1dd7fbcd41bbf 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-get-allowed.sub.html
@@ -3,15 +3,16 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>form-action-src-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS","TEST COMPLETE"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('Fail');
+        });
         window.addEventListener("message", function(event) {
             log(event.data);
         }, false);
@@ -28,15 +29,13 @@
 <body>
     <iframe name="test_target" id="test_iframe"></iframe>
 
-    <form action="/common/redirect.py" id="theform" method="get" target="test_target">
-        <input type="text" name="location" value="/content-security-policy/blink-contrib/resources/postmessage-pass.html">
+    <form action="/content-security-policy/support/postmessage-pass.html" id="theform" method="get" target="test_target">
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
     <p>Tests that allowed form actions work correctly
         with GET and a redirect.</p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
     </body>
 
 </html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-get-blocked.sub.html
similarity index 67%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-get-blocked.sub.html
index 0910eb419641e..638badc73a478 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-get-blocked.sub.html
@@ -3,15 +3,16 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="form-action 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>form-action-src-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=form-action","TEST COMPLETE"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-form-action 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('violated-directive=' + e.violatedDirective);
+        });
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
@@ -28,15 +29,13 @@
 <body>
     <iframe name="test_target" id="test_iframe"></iframe>
 
-    <form action="/common/redirect.py" id="theform" method="get" target="test_target">
-        <input type="text" name="location" value="/content-security-policy/blink-contrib/resources/postmessage-fail.html">
+    <form action="/common/redirect.py?location=/content-security-policy/support/postmessage-fail.html" id="theform" method="get" target="test_target">
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
     <p>Tests that disallowed form actions are blocked
         with GET and redirects.</p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=form-action%20&apos;none&apos;
 "></script>
     </body>
 
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html
similarity index 67%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html
index c362ea6fdc3a1..6997ef6e86036 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html
@@ -3,15 +3,16 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="form-action 'none'; script-src 'self' 'nonce-noncynonce'; connect-src 'self';">
     <title>form-action-src-javascript-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=form-action","TEST COMPLETE"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-form-action 'none'; script-src 'self' 'nonce-noncynonce'; connect-src 'self';
--->
     <script nonce='noncynonce'>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('violated-directive=' + e.violatedDirective);
+        });
         window.addEventListener('load', function() {
             setTimeout(function() {
                 document.getElementById('submit').click();
@@ -22,13 +23,12 @@
 </head>
 
 <body>
-    <form action="javascript:alert_assert(&quot;FAIL!&quot;)" id="theform" method="post">
+    <form action="javascript:log(&quot;FAIL!&quot;)" id="theform" method="post">
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
     <p>Tests that blocking form actions works correctly. If this test passes, a CSP violation will be generated, and will not see a JavaScript alert.</p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.sub.headers
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html
similarity index 70%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html
index e311817eb5978..86dfe7a03d2c9 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html
@@ -3,15 +3,16 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>form-action-src-redirect-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=form-action","TEST COMPLETE"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('violated-directive=' + e.violatedDirective);
+        });
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
@@ -29,13 +30,12 @@
 <body>
     <iframe name="test_target" id="test_iframe"></iframe>
 
-    <form id="form1" action="/common/redirect.py?location=http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/postmessage-fail.html" method="post" target="test_target">
+    <form id="form1" action="/common/redirect.py?location=http://{{domains[www1]}}:{{ports[http][0]}}/content-security-policy/support/postmessage-fail.html" method="post" target="test_target">
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
     <p>Tests that blocking a POST form with a redirect works correctly. If this test passes, a CSP violation will be generated.</p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=form-action%20'self'"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-default.sub.html
similarity index 57%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-default.sub.html
index a363ce9116f53..8211d0847a8ef 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-default.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-default.sub.html
@@ -3,22 +3,30 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="frame-src 'none'; object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>frame-src-about-blank-allowed-by-default</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
- 
-    <!-- enforcing policy:
-frame-src 'none'; object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
+    <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+    
     <p>These frames should not be blocked by Content-Security-Policy.
         It&apos;s pointless to block about:blank iframes because
         blocking a frame just results in displaying about:blank anyway!
     </p>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+    </script>    
+    
     <iframe src="about:blank"></iframe>
     <object type="text/html" data="about:blank"></object>
 
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
+    <script>
+        log("PASS");
+    </script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-scheme.sub.html
similarity index 50%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-scheme.sub.html
index e4c47392c25ee..ffa8638f8dad7 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-about-blank-allowed-by-scheme.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-scheme.sub.html
@@ -3,18 +3,26 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="frame-src about:; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>frame-src-about-blank-allowed-by-scheme</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
- 
-    <!-- enforcing policy:
-frame-src about:; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
+    <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+
     <p>This frame should not be blocked by Content-Security-Policy.
     </p>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+    </script>    
+    
     <iframe src="about:blank"></iframe>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
+    <script>
+        log("PASS");
+    </script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-allowed.sub.html
similarity index 82%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-allowed.sub.html
index 1d34679c8d0f6..470850df72dcd 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-allowed.sub.html
@@ -3,10 +3,15 @@
 
 <head>
     <title>frame-src-allowed</title>
+    <meta http-equiv="Content-Security-Policy" content="frame-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event."]'></script>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+        
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
@@ -36,9 +41,6 @@
         }
 
     </script>
-    <!-- enforcing policy:
-Content-Security-Policy: frame-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <p>
         This iframe should be allowed.
     </p>
@@ -55,9 +57,8 @@
 </head>
 
 <body>
-    <iframe src="/content-security-policy/blink-contrib/resources/postmessage-pass.html" onload="loadEvent()"></iframe>
+    <iframe src="/content-security-policy/support/postmessage-pass.html" onload="loadEvent()"></iframe>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-blocked.sub.html
similarity index 78%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-blocked.sub.html
index fe7555aebb505..7dbe87b347f28 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-blocked.sub.html
@@ -3,11 +3,16 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="frame-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>frame-src-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event."]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event.","violated-directive=frame-src"]'></script>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+        
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
@@ -34,9 +39,6 @@
         }
 
     </script>
-    <!-- enforcing policy:
-frame-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <p>
         IFrames blocked by CSP should generate a 'load', not 'error' event, regardless of blocked state. This means they appear to be normal cross-origin loads, thereby not leaking URL information directly to JS.
     </p>
@@ -53,9 +55,8 @@
 </head>
 
 <body>
-    <iframe src="/content-security-policy/blink-contrib/resources/postmessage-fail.html" onload="loadEvent()" onerror="log('FAIL')"></iframe>
+    <iframe src="/content-security-policy/support/postmessage-fail.html" onload="loadEvent()" onerror="log('FAIL')"></iframe>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=frame-src%20&apos;none&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-cross-origin-load.sub.html
similarity index 74%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-cross-origin-load.sub.html
index 5238e7c0f9d0a..341262d145607 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-cross-origin-load.sub.html
@@ -3,11 +3,16 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="frame-src 'self' http://www1.{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>frame-src-cross-origin-load</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event.","PASS IFrame %232 generated a load event.","PASS IFrame %233 generated a load event."]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS IFrame %231 generated a load event.","PASS IFrame %232 generated a load event.","PASS IFrame %233 generated a load event.","violated-directive=frame-src"]'></script>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+        
         window.addEventListener("message", function(event) {
             alert_assert(event.data);
         }, false);
@@ -37,9 +42,7 @@
         }
 
     </script>
-    <!-- enforcing policy:
-frame-src 'self' http://www1.{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
+    
     <p>
         IFrames blocked by CSP should generate a 'load', not 'error' event, regardless of blocked state. This means they appear to be normal cross-origin loads, thereby not leaking URL information directly to JS.
     </p>
@@ -56,11 +59,10 @@
 </head>
 
 <body>
-    <iframe src="resources/postmessage-pass.html" onload="loadEvent()"></iframe>
-    <iframe src="http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/postmessage-pass.html" onload="loadEvent()"></iframe>
-    <iframe src="http://www2.{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/postmessage-fail.html" onload="loadEvent()" onerror="log('FAIL')"></iframe>
+    <iframe src="../support/postmessage-pass.html" onload="loadEvent()"></iframe>
+    <iframe src="http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/postmessage-pass.html" onload="loadEvent()"></iframe>
+    <iframe src="http://www2.{{host}}:{{ports[http][0]}}/content-security-policy/support/postmessage-fail.html" onload="loadEvent()" onerror="log('FAIL')"></iframe>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=frame-src%20&apos;self&apos;http://www1.{{host}}:{{ports[http][0]}}"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/duplicate-directive.sub.html b/tests/wpt/web-platform-tests/content-security-policy/generic/duplicate-directive.sub.html
similarity index 71%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/duplicate-directive.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/generic/duplicate-directive.sub.html
index 4336b729b280a..7810533e45596 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/duplicate-directive.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/duplicate-directive.sub.html
@@ -3,18 +3,17 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-inline'; script-src 'none'; connect-src 'self';">    
     <title>duplicate-directive</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script src='../support/alertAssert.sub.js?alerts=["PASS (1/1)"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline'; script-src 'none'; connect-src 'self';
--->
-
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("FAIL");
+        });
         alert_assert('PASS (1/1)');
-
     </script>
 </head>
 
@@ -23,7 +22,6 @@
         This tests the effect of duplicated directives. It passes if the alert_assert() is executed.
     </p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html b/tests/wpt/web-platform-tests/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html
similarity index 80%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html
index f9e814a1e3b1c..401b65a898dd1 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html
@@ -3,14 +3,12 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>filesystem-urls-do-not-match-self</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=script-src"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'self'; connect-src 'self';
--->
 </head>
 
 <body>
@@ -18,11 +16,16 @@
         filesystem: URLs are same-origin with the page in which they were created, but explicitly do not match the &apos;self&apos; or &apos;*&apos; source in CSP directives because they are more akin to 'unsafe-inline' content..
     </p>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+          log("violated-directive=" + e.violatedDirective);
+        });
+    
         if(!window.webkitRequestFileSystem) {
             t_log = async_test();
             t_log.set_status(t_log.NOTRUN, "No filesystem:// support, cannot run test.");
             t_log.phase = t_log.phases.HAS_RESULT;
             t_log.done();
+            log("violated-directive=script-src"); // simulate needed logs to pass test
         } else {
             function fail() {
                 alert_assert("FAIL!");
@@ -46,11 +49,6 @@
                         });
                     });
                 });
-            var s = document.createElement('script');
-            s.async = true;
-            s.defer = true;
-            s.src = "../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;self&apos;%20&apos;unsafe-inline&apos;%20&apos;*&apos;"
-            document.lastChild.appendChild(s);
         }
 
 
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html b/tests/wpt/web-platform-tests/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html
similarity index 86%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html
index 99e8592e59313..28cad3a89d95c 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html
@@ -3,14 +3,12 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' filesystem:; connect-src 'self';">
     <title>filesystem-urls-match-filesystem</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS (1/1)"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline' 'self'; connect-src 'self';
--->
 </head>
 
 <body>
@@ -18,10 +16,15 @@
         filesystem: URLs are same-origin with the page in which they were created, but explicitly do not match the &apos;self&apos; or &apos;*&apos; source in CSP directives because they are more akin to 'unsafe-inline' content, but should match filesystem: source.
     </p>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+    
         if(!window.webkitRequestFileSystem) {
             t_log.set_status(t_log.NOTRUN, "No filesystem:// support, cannot run test.");
             t_log.phase = t_log.phases.HAS_RESULT;
             t_log.done();
+            log("PASS (1/1)"); // simulate needed logs to pass test
         } else {
             function pass() {
                 log("PASS (1/1)");
@@ -45,11 +48,6 @@
                         });
                     });
                 });
-            var s = document.createElement('script');
-            s.async = true;
-            s.defer = true;
-            s.src = "../support/checkReport.sub.js?reportExists=false"
-            document.lastChild.appendChild(s);
         }
 
     </script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-img-src.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-img-src.html
index 0c10215898567..3644fe3faba51 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-img-src.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-img-src.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>default-src should cascade to img-src directive</title>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='../support/siblingPath.js'></script>
@@ -13,6 +14,11 @@ <h1>default-src should cascade to img-src directive</h1>
     <script>
       var imgsrc = async_test("Verify cascading of default-src to img-src policy");
       var onerrorFired = false;
+      var t_spv = async_test("Should fire violation events for every failed violation");
+      
+      window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+          assert_equals(e.violatedDirective, "img-src");
+      }));
     </script>
 
     <img id='imgfail' src=''
@@ -28,8 +34,5 @@ <h1>default-src should cascade to img-src directive</h1>
         imgsrc.done();
       }
     </script>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=img-src%20%27self%27%20%27unsafe-inline%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-img-src.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-img-src.html.sub.headers
deleted file mode 100644
index 61bdc0a305ea9..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-img-src.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: generic-0_1-img-src={{$id:uuid()}}; Path=/content-security-policy/generic/
-Content-Security-Policy: default-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-script-src.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-script-src.html
index e4f0d1d5054f9..d27b922565b84 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-script-src.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-script-src.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>default-src should cascade to script-src directive</title>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='../support/siblingPath.js'></script>
@@ -14,6 +15,11 @@ <h1>default-src should cascade to script-src directive</h1>
       var scriptsrc1 = async_test("Verify cascading of default-src to script-src policy: block");
       var scriptsrc2 = async_test("Verify cascading of default-src to script-src policy: allow");
       var allowedScriptRan = false;
+      var t_spv = async_test("Should fire violation events for every failed violation");
+      
+      window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+          assert_equals(e.violatedDirective, "script-src");
+      }));
     </script>
 
     <script src='pass-0_1.js'></script>
@@ -28,8 +34,5 @@ <h1>default-src should cascade to script-src directive</h1>
           scriptsrc2.done();
       }
     </script>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27%20%27unsafe-inline%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-script-src.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-script-src.html.sub.headers
deleted file mode 100644
index b3ff8c460f5d7..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-script-src.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: generic-0_1-script-src={{$id:uuid()}}; Path=/content-security-policy/generic/
-Content-Security-Policy: default-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10.html
index 703e50b44602b..5dfd9d83c7ff3 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10.html
@@ -2,20 +2,26 @@
 <html>
 <head>
     <title>test implicit port number matching (requires port 80)</title>
+    <meta http-equiv="Content-Security-Policy content="script-src 'self' www.{{host}} 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script>
+      var t = async_test("Test that script does not fire violation event");
+      window.addEventListener("securitypolicyviolation", t.unreached_func("Should not have fired a violation event"));
+      
       var head = document.getElementsByTagName('head')[0];
       var script = document.createElement('script');
       script.type = 'text/javascript';
       script.src = "http://www." + location.hostname + "/content-security-policy/generic/positiveTest.js";
       head.appendChild(script);
     </script>
+    
+    <script>
+        t.done();
+    </script>    
 </head>
 <body>
     <h1>test implicit port number matching (requires port 80)</h1>
     <div id='log'></div>
-
-    <script async defer src='../support/checkReport.sub.js?reportExists=false'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10.html.sub.headers
deleted file mode 100644
index c58b0536ff76d..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: generic-0_10={{$id:uuid()}}; Path=/content-security-policy/generic/
-Content-Security-Policy: script-src 'self' www.{{host}} 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10_1.sub.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10_1.sub.html
index c66640de33331..107ab905bcfc1 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10_1.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10_1.sub.html
@@ -2,10 +2,16 @@
 <html>
 <head>
     <title>implicit port number matching fails with a different port</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' www.{{host}} 'unsafe-inline';">    
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='negativeTests.js'></script>
     <script>
+      var t_spv = async_test("Should fire violation events for every failed violation");
+      window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+          assert_equals(e.violatedDirective, "script-src");
+      }));
+      
       var head = document.getElementsByTagName('head')[0];
       var script = document.createElement('script');
       script.type = 'text/javascript';
@@ -16,7 +22,5 @@
 <body>
     <h1>implicit port number matching fails with a different port</h1>
     <div id='log'></div>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27%20www.{{host}}%20%27unsafe-inline%27'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10_1.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10_1.sub.html.sub.headers
deleted file mode 100644
index e8fcf07c2030d..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10_1.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: generic-0_10_1={{$id:uuid()}}; Path=/content-security-policy/generic/
-Content-Security-Policy: script-src 'self' www.{{host}} 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2.html
index 130bfadad9656..ecfeaf66cb590 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2.html
@@ -2,14 +2,20 @@
 <html>
 <head>
     <title>'self' keyword positive test</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'nonce-abc';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
+    <script nonce='abc'>
+      var t_spv = async_test("Should fire violation events for every failed violation");
+      window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+          assert_equals(e.violatedDirective, "script-src");
+      }));      
+    </script>
     <script src='positiveTest.js'></script>
+    <script nonce='abc'>t_spv.done();</script>
 </head>
 <body>
     <h1>'self' keyword positive test</h1>
     <div id='log'></div>
-
-    <script async defer src='../support/checkReport.sub.js?reportExists=false'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2.html.sub.headers
deleted file mode 100644
index 776112de60d68..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: generic-0_2={{$id:uuid()}}; Path=/content-security-policy/generic/
-Content-Security-Policy: script-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_2.sub.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_2.sub.html
index 9d274ea597ee2..cdb6238e4e0df 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_2.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_2.sub.html
@@ -2,10 +2,16 @@
 <html>
 <head>
     <title>'self' fails with a different port</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='negativeTests.js'></script>
     <script>
+      var t_spv = async_test("Should fire violation events for every failed violation");
+      window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+          assert_equals(e.violatedDirective, "script-src");
+      }));
+      
       var head = document.getElementsByTagName('head')[0];
       var script = document.createElement('script');
       script.type = 'text/javascript';
@@ -16,7 +22,5 @@
 <body>
     <h1>'self' fails with a different port</h1>
     <div id='log'></div>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27%20%27unsafe-inline%27'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_2.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_2.sub.html.sub.headers
deleted file mode 100644
index 769ccc154e5cb..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_2.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: generic-0_2_2={{$id:uuid()}}; Path=/content-security-policy/generic/
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_3.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_3.html
index ff4b8db8a780f..754c9a3288f88 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_3.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_3.html
@@ -2,10 +2,16 @@
 <html>
 <head>
     <title>'self' fails with a different host (including sub-host e.g. foo.com as self with content from bar.foo.com)</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='negativeTests.js'></script>
     <script>
+      var t_spv = async_test("Should fire violation events for every failed violation");
+      window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+          assert_equals(e.violatedDirective, "script-src");
+      }));
+      
       var head = document.getElementsByTagName('head')[0];
       var script = document.createElement('script');
       script.type = 'text/javascript';
@@ -16,7 +22,5 @@
 <body>
     <h1>'self' fails with a different host (including sub-host e.g. foo.com as self with content from bar.foo.com)</h1>
     <div id='log'></div>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27%20%27unsafe-inline%27'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_3.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_3.html.sub.headers
deleted file mode 100644
index 0a8defccd6ce9..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_3.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: generic-0_2_3={{$id:uuid()}}; Path=/content-security-policy/generic/
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.html.sub.headers
deleted file mode 100644
index 34756f9dbe08a..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: generic-0_8={{$id:uuid()}}; Path=/content-security-policy/generic/
-Content-Security-Policy: script-src 'self' *.{{host}}:{{ports[http][0]}} 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.sub.html
similarity index 66%
rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.html
rename to tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.sub.html
index 2e7df3776ad75..78f7aa0cfa650 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.sub.html
@@ -2,21 +2,27 @@
 <html>
 <head>
     <title>test wildcard host name matching (*.web-platform.test is good)</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' *.{{host}}:{{ports[http][0]}} 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='wildcardHostTest.js'></script>
     <script>
+      var t = async_test("Test that script does not fire violation event");
+      window.addEventListener("securitypolicyviolation", t.unreached_func("Should not have fired a violation event"));
+      
       var head = document.getElementsByTagName('head')[0];
       var script = document.createElement('script');
       script.type = 'text/javascript';
       script.src = "http://www." + location.hostname + ":" + location.port + "/content-security-policy/generic/wildcardHostTestSuceeds.js";
       head.appendChild(script);
     </script>
+
+    <script>
+        t.done();
+    </script>    
 </head>
 <body>
     <h1>test wildcard host name matching (*.web-platform.test is good)</h1>
     <div id='log'></div>
-
-    <script async defer src='../support/checkReport.sub.js?reportExists=false'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html
index 167b4458da738..1a2096f78ebe0 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html
@@ -2,10 +2,16 @@
 <html>
 <head>
     <title>test wildcard host name matching (www*.web-platform.test is bad, *www.web-platform.test is bad)</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' *w.{{host}}:{{ports[http][0]}} w*.{{host}}:{{ports[http][0]}} 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='wildcardHostTestFailure.js'></script>
     <script>
+      var t_spv = async_test("Should fire violation events for every failed violation");
+      window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+          assert_equals(e.violatedDirective, "script-src");
+      }));
+      
       var head = document.getElementsByTagName('head')[0];
       var script = document.createElement('script');
       script.type = 'text/javascript';
@@ -16,6 +22,5 @@
 <body>
     <h1>test wildcard host name matching (www*.web-platform.test is bad, *www.web-platform.test is bad)</h1>
     <div id='log'></div>
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27%20*w.{{host}}:{{ports[http][0]}}%20w*.{{host}}:{{ports[http][0]}}%20%27unsafe-inline%27'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html.sub.headers
deleted file mode 100644
index 57a038a05390b..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: generic-0_8_1={{$id:uuid()}}; Path=/content-security-policy/generic/
-Content-Security-Policy: script-src 'self' *w.{{host}}:{{ports[http][0]}} w*.{{host}}:{{ports[http][0]}} 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_9.sub.html b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_9.sub.html
index cadeb178f3ac1..150876c917d4b 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_9.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_9.sub.html
@@ -2,21 +2,27 @@
 <html>
 <head>
     <title>test wildcard port number matching</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' {{host}}:* 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='wildcardPortTest.js'></script>
     <script>
+      var t = async_test("Test that script does not fire violation event");
+      window.addEventListener("securitypolicyviolation", t.unreached_func("Should not have fired a violation event"));
+      
       var head = document.getElementsByTagName('head')[0];
       var script = document.createElement('script');
       script.type = 'text/javascript';
       script.src = "http://" + location.hostname + ":{{ports[http][1]}}/content-security-policy/generic/wildcardPortTestSuceeds.js";
       head.appendChild(script);
     </script>
+
+    <script>
+        t.done();
+    </script>  
 </head>
 <body>
     <h1>test wildcard port number matching</h1>
-    <div id='log'></div>
-
-    <script async defer src='../support/checkReport.sub.js?reportExists=false'></script>
+    <div id='log'></div>  
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_9.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_9.sub.html.sub.headers
deleted file mode 100644
index 2f23360097d40..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_9.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: generic-0_9={{$id:uuid()}}; Path=/content-security-policy/generic/
-Content-Security-Policy: script-src 'self' {{host}}:* 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/policy-does-not-affect-child.sub.html b/tests/wpt/web-platform-tests/content-security-policy/generic/policy-does-not-affect-child.sub.html
new file mode 100644
index 0000000000000..e36ca477b5aa4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/policy-does-not-affect-child.sub.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'nonce-abc';">
+    <title>object-src-url-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+  <script nonce='abc'>
+    window.onmessage = function(e) {
+      log(e.data);
+    }
+  </script>
+  <iframe src="support/log-pass.html"></iframe>
+  <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/log-pass.html b/tests/wpt/web-platform-tests/content-security-policy/generic/support/log-pass.html
new file mode 100644
index 0000000000000..4334ea4c66b53
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/support/log-pass.html
@@ -0,0 +1,3 @@
+<script>
+   window.parent.postMessage('PASS', '*');
+</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html b/tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html
new file mode 100644
index 0000000000000..9480e521de21e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html
@@ -0,0 +1,4 @@
+<script>
+  window.parent.postMessage('PASS (1/2): Script can execute', '*');
+  eval("window.parent.postMessage('PASS (2/2): Eval works', '*')");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html.sub.headers
new file mode 100644
index 0000000000000..c7e4e7cc5bd3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html.sub.headers
@@ -0,0 +1 @@
+Content-Security-Policy: sandbox allow-scripts
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/icon-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/img-src/icon-allowed.sub.html
new file mode 100644
index 0000000000000..7358944f47629
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/img-src/icon-allowed.sub.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Security-Policy" content="img-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
+  <script src='/resources/testharness.js'></script>
+  <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+  <p>Use callbacks to show that favicons are loaded as allowed by CSP when link tags are dynamically added to the page.</p>
+  <script>
+    var t = async_test("Test that image loads");
+    window.addEventListener("securitypolicyviolation", t.unreached_func("Should not have triggered any violation events"));
+    
+    function createLink(rel, src) {
+        var link = document.createElement('link');
+        link.rel = rel;
+        link.href = src;
+        link.onload = t.done();
+        link.onerror = t.unreached_func('The image should have loaded');
+        document.body.appendChild(link);
+    }
+    window.addEventListener('DOMContentLoaded', function() {
+        createLink('icon', '../support/pass.png');
+    });
+
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/icon-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/img-src/icon-blocked.sub.html
new file mode 100644
index 0000000000000..42500fc3ad2b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/img-src/icon-blocked.sub.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Security-Policy" content="img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
+  <script src='/resources/testharness.js'></script>
+  <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+<p>Use callbacks to show that favicons are not loaded in violation of CSP when link tags are dynamically added to the page.</p>
+  <script>
+    var t = async_test("Test that image does not load");
+    var t_spv = async_test("Test that spv event is fired");
+    window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+      assert_equals(e.violatedDirective, 'img-src');
+      assert_true(e.blockedURI.endsWith('/support/fail.png'));
+    }));
+    
+    function createLink(rel, src) {
+        var link = document.createElement('link');
+        link.rel = rel;
+        link.href = src;
+        link.onerror = t.done();
+        link.onload = t.unreached_func('The image should not have loaded');
+        document.head.appendChild(link);
+    }
+    window.addEventListener('DOMContentLoaded', function() {
+        createLink('icon', '../support/fail.png');
+    });
+
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-blocked-data-uri.sub.html b/tests/wpt/web-platform-tests/content-security-policy/img-src/report-blocked-data-uri.sub.html
similarity index 55%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-blocked-data-uri.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/img-src/report-blocked-data-uri.sub.html
index dea8a87a31bdb..7ef1e978fedc8 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-blocked-data-uri.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/img-src/report-blocked-data-uri.sub.html
@@ -3,20 +3,23 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="img-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>report-blocked-data-uri</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=img-src"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-img-src 'none'; report-uri resources/save-report.php?test=report-blocked-data-uri.html; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body>
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+       });
+    </script>
+    
     <img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==">
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=img-src%20&apos;none&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1.html b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1.html
index 2cd28b475881e..8fd094e95537d 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Video element src attribute must match src list - positive test</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'; media-src 'self'">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -12,9 +13,15 @@ <h1>Video element src attribute must match src list - positive test</h1>
   <script>
     var src_test = async_test("In-policy async video src");
     var source_test = async_test("In-policy async video source element");
+    var t_spv = async_test("Should not fire policy violation events");
+    var test_count = 2;
+    window.addEventListener("securitypolicyviolation", t_spv.unreached_func("Should not have fired any event"));
 
     function media_loaded(t) {
       t.done();
+      if (--test_count <= 0) {
+        t_spv.done();
+      }
     }
 
     function media_error_handler(t) {
@@ -37,8 +44,5 @@ <h1>Video element src attribute must match src list - positive test</h1>
            onloadeddata="media_loaded(src_test)"
            src="/media/A4.ogv">
 
-  <script async defer src="../support/checkReport.sub.js?reportExists=false">
-  </script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1.html.sub.headers
deleted file mode 100644
index 9361207e899da..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-7_1={{$id:uuid()}}; Path=/content-security-policy/media-src/
-Content-Security-Policy: script-src * 'unsafe-inline'; media-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1_2.sub.html b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1_2.sub.html
index 58b566c1dbcda..a293d008b35b4 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1_2.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1_2.sub.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>Video element src attribute must match src list - negative test</title>
-    <meta name=timeout content=long>
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'; media-src 'self';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -13,6 +13,15 @@ <h1>Video element src attribute must match src list - negative test</h1>
   <script>
       var src_test = async_test("Disallowed async video src");
       var source_test = async_test("Disallowed async video source element");
+      var t_spv = async_test("Test that securitypolicyviolation events are fired");
+      var test_count = 2;
+      window.addEventListener("securitypolicyviolation", t_spv.step_func(function(e) {
+          assert_equals(e.violatedDirective, "media-src");
+          assert_equals(e.blockedURI, mediaURL);
+          if (--test_count <= 0) {
+              t_spv.done(); 
+          }
+      }));
 
       // we assume tests are run from 'hostname' and 'www.hostname' or 'www2.hostname' is a valid alias
       var mediaURL = location.protocol + "//{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv";
@@ -44,7 +53,5 @@ <h1>Video element src attribute must match src list - negative test</h1>
         document.getElementById("videoObject2").src = mediaURL;
     </script>
 
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=media-src%20%27self%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1_2.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1_2.sub.html.sub.headers
deleted file mode 100644
index 036da86739e42..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1_2.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-7_1_2={{$id:uuid()}}; Path=/content-security-policy/media-src/
-Content-Security-Policy: script-src * 'unsafe-inline'; media-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2.html b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2.html
index 6b70da22c57b1..0486c8738dac2 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Audio element src attribute must match src list - positive test</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'; media-src 'self';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -12,9 +13,15 @@ <h1>Audio element src attribute must match src list - positive test</h1>
   <script>
     var src_test = async_test("In-policy audio src");
     var source_test = async_test("In-policy audio source element");
+    var t_spv = async_test("Should not fire policy violation events");
+    var test_count = 2;
+    window.addEventListener("securitypolicyviolation", t_spv.unreached_func("Should not have fired any event"));
 
     function media_loaded(t) {
       t.done();
+      if (--test_count <= 0) {
+        t_spv.done();
+      }
     }
 
     function media_error_handler(t) {
@@ -37,8 +44,5 @@ <h1>Audio element src attribute must match src list - positive test</h1>
            onloadeddata="media_loaded(src_test)"
            src="/media/sound_5.oga">
 
-  <script async defer src="../support/checkReport.sub.js?reportExists=false">
-  </script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2.html.sub.headers
deleted file mode 100644
index 0f59cd9ffd150..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-7_2={{$id:uuid()}}; Path=/content-security-policy/media-src/
-Content-Security-Policy: script-src * 'unsafe-inline'; media-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2_2.sub.html b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2_2.sub.html
index 14fce4aecd14b..a1f29085afe69 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2_2.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2_2.sub.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>Audio element src attribute must match src list - negative test</title>
-    <meta name=timeout content=long>
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'; media-src 'self';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -13,6 +13,15 @@ <h1>Audio element src attribute must match src list - negative test</h1>
   <script>
       var src_test = async_test("Disallaowed audio src");
       var source_test = async_test("Disallowed audio source element");
+      var t_spv = async_test("Test that securitypolicyviolation events are fired");
+      var test_count = 2;
+      window.addEventListener("securitypolicyviolation", t_spv.step_func(function(e) {
+          assert_equals(e.violatedDirective, "media-src");
+          assert_equals(e.blockedURI, mediaURL);
+          if (--test_count <= 0) {
+              t_spv.done(); 
+          }
+      }));
 
       // we assume tests are run from 'hostname' and 'www.hostname' or 'www2.hostname' is a valid alias
       var mediaURL = location.protocol + "//{{domains[www2]}}:{{ports[http][0]}}/media/sound_5.oga";
@@ -44,7 +53,5 @@ <h1>Audio element src attribute must match src list - negative test</h1>
         document.getElementById("audioObject2").src = mediaURL;
     </script>
 
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=media-src%20%27self%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2_2.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2_2.sub.html.sub.headers
deleted file mode 100644
index 685978de3a91f..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2_2.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-7_2_2={{$id:uuid()}}; Path=/content-security-policy/media-src/
-Content-Security-Policy: script-src * 'unsafe-inline'; media-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3.sub.html b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3.sub.html
index 552b3af8930c6..05aa134e820ea 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3.sub.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Video track src attribute must match src list - positive test</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'; media-src 'self' {{domains[www]}}:{{ports[http][0]}};"> 
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -12,10 +13,17 @@ <h1>Video track src attribute must match src list - positive test</h1>
   <script>
     var source_test = async_test("In-policy track element");
 
-      var trackURL = location.protocol + "//{{domains[www]}}:{{ports[http][0]}}/media/foo.vtt";
+    var trackURL = location.protocol + "//{{domains[www]}}:{{ports[http][0]}}/media/foo.vtt";
+
+    var t_spv = async_test("Should not fire policy violation events");
+    var test_count = 1;
+    window.addEventListener("securitypolicyviolation", t_spv.unreached_func("Should not have fired any event"));
 
     function media_loaded(t) {
       t.done();
+      if (--test_count <= 0) {
+        t_spv.done();
+      }
     }
 
     function media_error_handler(t) {
@@ -41,8 +49,5 @@ <h1>Video track src attribute must match src list - positive test</h1>
         document.getElementById("trackObject").src = trackURL;
     </script>
 
-  <script async defer src="../support/checkReport.sub.js?reportExists=false">
-  </script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3.sub.html.sub.headers
deleted file mode 100644
index 0e95fe959411d..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-7_3={{$id:uuid()}}; Path=/content-security-policy/media-src/
-Content-Security-Policy: script-src * 'unsafe-inline'; media-src 'self' {{domains[www]}}:{{ports[http][0]}}; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3_2.sub.html b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3_2.sub.html
index 5d13624c091bc..6abe850624f9b 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3_2.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3_2.sub.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Video track src attribute must match src list - negative test</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'; media-src 'self';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -13,7 +14,18 @@ <h1>Video track src attribute must match src list - negative test</h1>
     var source_test =
         async_test("Disallowed track element onerror handler fires.");
 
-      var trackURL = location.protocol + "//{{domains[www]}}:{{ports[http][0]}}/media/foo.vtt";
+    var trackURL = location.protocol + "//{{domains[www]}}:{{ports[http][0]}}/media/foo.vtt";
+    
+    var t_spv = async_test("Test that securitypolicyviolation events are fired");
+    var test_count = 1;
+    window.addEventListener("securitypolicyviolation", t_spv.step_func(function(e) {
+          assert_equals(e.violatedDirective, "media-src");
+          assert_equals(e.blockedURI, trackURL);
+          if (--test_count <= 0) {
+              t_spv.done(); 
+          }
+      }));
+
 
     function media_loaded(t) {
      t.step( function () {
@@ -56,8 +68,5 @@ <h1>Video track src attribute must match src list - negative test</h1>
         }, 2 * 1000);
     </script>
 
-  <script async defer src="../support/checkReport.sub.js?reportField=violated-directive&reportValue=media-src%20%27self%27">
-  </script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3_2.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3_2.sub.html.sub.headers
deleted file mode 100644
index 2cfe51fe8e272..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3_2.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-7_3_2={{$id:uuid()}}; Path=/content-security-policy/media-src/
-Content-Security-Policy: script-src * 'unsafe-inline'; media-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-blocked.sub.html
index 61f1598eb6b9b..10de725e954ae 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-blocked.sub.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>Video element src attribute must match src list - 'none' negative test</title>
-    <meta name=timeout content=long>
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'; media-src 'none'; connect-src 'self';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -21,6 +21,16 @@ <h1>Video element src attribute must match src list - 'none' negative test</h1>
 
       var v_mediaURL = location.protocol + "//{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv";
 
+      var t_spv = async_test("Test that securitypolicyviolation events are fired");
+      var test_count = 4;
+      window.addEventListener("securitypolicyviolation", t_spv.step_func(function(e) {
+          assert_equals(e.violatedDirective, "media-src");
+          assert_true(e.blockedURI == a_mediaURL || e.blockedURI == v_mediaURL, "Unexpected blockedURI");
+          if (--test_count <= 0) {
+              t_spv.done(); 
+          }
+      }));
+
       function media_loaded(t) {
         t.step( function () {
           assert_unreached("Media error handler should be triggered for non-allowed domain.");
@@ -62,9 +72,5 @@ <h1>Video element src attribute must match src list - 'none' negative test</h1>
         document.getElementById("audioSourceObject").src = a_mediaURL;
         document.getElementById("audioObject2").src = a_mediaURL;
     </script>
-
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=media-src%20%27self%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-blocked.sub.html.sub.headers
deleted file mode 100644
index 72344214f1a6d..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-blocked={{$id:uuid()}}; Path=/content-security-policy/media-src/
-Content-Security-Policy: script-src * 'unsafe-inline'; media-src 'none'; connect-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-redir-bug.sub.html b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-redir-bug.sub.html
index 7012b9cc83f17..a0708bf5ed3c1 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-redir-bug.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-redir-bug.sub.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Video element src attribute must match src list - positive test</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'; media-src http://{{domains[www2]}}:{{ports[http][0]}}/ 'self'; connect-src 'self';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -21,8 +22,15 @@ <h1>Video element in media-src list - redirect test</h1>
     var source_test = async_test("In-policy async video source element");
     var source_redir_test = async_test("In-policy async video source element w/redir");
 
+    var t_spv = async_test("Should not fire policy violation events");
+    var test_count = 4;
+    window.addEventListener("securitypolicyviolation", t_spv.unreached_func("Should not have fired any event"));
+
     function media_loaded(t) {
       t.done();
+      if (--test_count <= 0) {
+        t_spv.done();
+      }
     }
 
     function media_error_handler(t) {
@@ -59,8 +67,5 @@ <h1>Video element in media-src list - redirect test</h1>
            onloadeddata="media_loaded(src_redir_test)"
            src="/common/redirect.py?location=http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv">
 
-  <script async defer src="../support/checkReport.sub.js?reportExists=false">
-  </script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
deleted file mode 100644
index 7c2243a1116b5..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-redir-bug={{$id:uuid()}}; Path=/content-security-policy/media-src/
-Content-Security-Policy: script-src * 'unsafe-inline'; media-src http://{{domains[www2]}}:{{ports[http][0]}}/ 'self'; connect-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html b/tests/wpt/web-platform-tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html
similarity index 86%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html
index 66b86f195d7f6..6e9e71dd921a8 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/combine-header-and-meta-policies.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html
@@ -7,7 +7,7 @@
     <title>combine-header-and-meta-policies</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
+    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE", "violated-directive=img-src", "violated-directive=style-src"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
     <!-- enforcing multiple policies:
 Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; style-src 'self'
@@ -20,6 +20,10 @@
     style block from the header-supplied policy.</p>
 
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+    
         var img = document.createElement('img');
         img.src = '../support/fail.png';
         img.onerror = function() {
@@ -45,7 +49,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=style-src%20&apos;self&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html.sub.headers
similarity index 56%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html.sub.headers
rename to tests/wpt/web-platform-tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html.sub.headers
index 4c620525a37d3..062d823228a0b 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-disallowed-from-meta.sub.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html.sub.headers
@@ -2,4 +2,4 @@ Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
-Set-Cookie: report-disallowed-from-meta=5ada7c32-1c46-4b79-a95f-af33fcf95f8e; Path=/content-security-policy/blink-contrib
\ No newline at end of file
+Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; style-src 'self';
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html b/tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html
similarity index 71%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html
index 41618d4ef7705..94ae5e3979c60 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/meta-outside-head.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html
@@ -9,19 +9,24 @@
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script src='../support/alertAssert.sub.js?alerts=["PASS (1/1)"]'></script>
     <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'none'; connect-src 'self';
+script-src 'self' 'unsafe-inline' 'nonce-abc'; connect-src 'self';
 -->
 </head>
 
 <body>
+    <script nonce='abc'>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("Fail");
+        });
+    </script>    
+
     <meta http-equiv="Content-Security-Policy" content="script-src 'self'">
     <p>This test checks that Content Security Policy delivered via a meta element is not enforced if the element is outside the document&apos;s head.</p>
-    <script>
+    <script nonce='abc'>
         var aa = "PASS (1/1)";
     </script>
-    <script src="metaHelper.js"></script>
+    <script src="../meta/support/metaHelper.js"></script>
     <div id="log"></div>
-    <script src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html.sub.headers
new file mode 100644
index 0000000000000..8e90073147a23
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html.sub.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline' 'nonce-abc'; connect-src 'self';
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/metaHelper.js b/tests/wpt/web-platform-tests/content-security-policy/meta/support/metaHelper.js
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/metaHelper.js
rename to tests/wpt/web-platform-tests/content-security-policy/meta/support/metaHelper.js
diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-allowed.sub.html
new file mode 100644
index 0000000000000..f8cab44230b22
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-allowed.sub.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="object-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
+    <title>object-src-no-url-allowed</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <p>This test passes if there isn&apos;t a CSP violation saying the plugin was blocked.</p>
+
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+       });
+    </script>
+
+    <object type="application/x-webkit-test-netscape"></object>
+    <div id="log"></div>
+    
+    <script>
+        log("PASS");
+    </script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-blocked.sub.html
new file mode 100644
index 0000000000000..030da4db26888
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-blocked.sub.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
+    <title>object-src-no-url-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=object-src"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <p>This test passes if there is a CSP violation saying the plugin was blocked.</p>
+
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+       });
+    </script>
+    
+    <object type="application/x-webkit-test-netscape"></object>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-allowed.sub.html
similarity index 51%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-allowed.sub.html
index 68f86dec6e7b4..eecdea54cd8a8 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/connect-src-websocket-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-allowed.sub.html
@@ -3,28 +3,28 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>connect-src-websocket-blocked</title>
+    <meta http-equiv="Content-Security-Policy" content="object-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
+    <title>object-src-url-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["Pass"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-connect-src 'self' ws://127.0.0.1:8880; script-src 'self' 'unsafe-inline';
--->
 </head>
 
 <body>
+    <p>This test passes if there is no CSP violation saying the plugin was blocked.</p>
+
     <script>
-        try {
-            var ws = new WebSocket("ws://localhost:8880/echo");
+       window.addEventListener('securitypolicyviolation', function(e) {
             log("Fail");
-        } catch (e) {
-            log("Pass");
-        }
-
+       });
     </script>
+
+    <object data="/content-security-policy/support/pass.png"></object>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=connect-src%20ws://127.0.0.1:8880"></script>
+    <script>
+        log("Pass");
+    </script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-blocked.sub.html
new file mode 100644
index 0000000000000..8a6594de05d62
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-blocked.sub.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
+    <title>object-src-url-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=object-src"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <p>This test passes if there is a CSP violation saying the plugin was blocked.</p>
+    
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+       });
+    </script>
+    
+    <object data="/plugins/resources/mock-plugin.pl"></object>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html
similarity index 63%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html
index fe3f95878d2a2..947a9174d8871 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-data.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html
@@ -3,22 +3,27 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>plugintypes-mismatched-data</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
+    <script src='../support/logTest.sub.js?logs=["After object"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-
 </head>
 
 <body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+    </script>    
+
     This tests that plugin content that doesn&apos;t match the declared type doesn&apos;t load, even if the document&apos;s CSP would allow it. This test passes if &quot;FAIL!&quot; isn&apos;t logged.
     <object type="application/x-invalid-type" data="data:application/x-webkit-test-netscape,logifloaded" log="FAIL!"></object>
+    <script>
+        log("After object");
+    </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html
similarity index 64%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html
index bc60994ad3a03..08e09b95063c1 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-mismatched-url.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html
@@ -3,22 +3,27 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>plugintypes-mismatched-url</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
+    <script src='../support/logTest.sub.js?logs=["After object"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-
 </head>
 
 <body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+    </script>    
+
     This tests that plugin content that doesn&apos;t match the declared type doesn&apos;t load, even if the document&apos;s CSP would allow it. This test passes if no iframe is dumped (meaning that no PluginDocument was created).
     <object type="application/x-invalid-type" data="/plugins/resources/mock-plugin.pl" log="FAIL!"></object>
+    <script>
+        log("After object");
+    </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-data.sub.html
similarity index 67%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-data.sub.html
index eb60d5d4cffc8..46b1816b79231 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-data.sub.html
@@ -3,21 +3,24 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>plugintypes-notype-data</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS: object tag onerror handler fired"]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS: object tag onerror handler fired","violated-directive=plugin-types"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+    </script>    
+
     Given a `plugin-types` directive, plugins have to declare a type explicitly. No declared type, no load. This test passes if there&apos;s a CSP report and &quot;FAIL!&quot; isn&apos;t logged.
     <object data="data:application/x-webkit-test-netscape" onload="log('FAIL');" onerror="log('PASS: object tag onerror handler fired');"></object>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=plugin-types+application/x-invalid-type"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-url.sub.html
similarity index 60%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-url.sub.html
index e9918941fd368..3191f9c93b85c 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-url.sub.html
@@ -3,22 +3,24 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>plugintypes-notype-url</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=plugin-types"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-
 </head>
 
 <body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+    </script>    
+
     Given a `plugin-types` directive, plugins have to declare a type explicitly. No declared type, no load. This test passes if there&apos;s an error report is sent.
     <object data="/plugins/resources/mock-plugin.pl" log="FAIL!"></object>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=plugin-types%20application/x-invalid-type"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html
similarity index 56%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html
index 222d6500d1bc6..cc30b0d9c80c9 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/plugintypes-nourl-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html
@@ -3,21 +3,27 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="plugin-types application/x-webkit-test-netscape; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>plugintypes-nourl-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
+    <script src='../support/logTest.sub.js?logs=["After object"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-plugin-types application/x-webkit-test-netscape; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+    </script>    
+
     This test passes if there isn&apos;t a CSP violation sayingthe plugin was blocked.
     <object type="application/x-webkit-test-netscape"></object>
+    <script>
+        log("After object");
+    </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html
similarity index 53%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html
index ad3eebcaeb59b..40054d5333630 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html
@@ -3,21 +3,24 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <title>object-src-no-url-blocked</title>
+    <meta http-equiv="Content-Security-Policy" content="plugin-types text/plain; script-src 'self' 'unsafe-inline'; connect-src 'self';">
+    <title>plugintypes-nourl-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=plugin-types"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-object-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+    </script>    
+
     This test passes if there is a CSP violation saying the plugin was blocked.
     <object type="application/x-webkit-test-netscape"></object>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=object-src%20&apos;none&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html
new file mode 100644
index 0000000000000..cb3842854c83d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test that reports using the report-api service are not sent when there's not validation</title>
+  <script src='/resources/testharness.js'></script>
+  <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+  <script>
+    var t1 = async_test("Test that image loads");
+    window.addEventListener("securitypolicyviolation",
+         t1.unreached_func("Should not have triggered a violation event"));
+  </script>
+  <img src='/content-security-policy/support/pass.png'
+       onload='t1.done();'
+       onerror='t1.unreached_func("The image should have loaded");'>
+
+  <script async defer src='../support/checkReport.sub.js?reportExists=false'></script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html.sub.headers
new file mode 100644
index 0000000000000..9a025812946b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-doesnt-send-reports-without-violation.https.sub.html.sub.headers
@@ -0,0 +1,7 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: reporting-api-doesnt-send-reports-without-violation={{$id:uuid()}}; Path=/content-security-policy/reporting
+Report-To: { "url": "https://{{host}}:{{ports[https][0]}}/content-security-policy/support/report.py?op=put&reportID={{$id}}", "group": "csp-group", "max-age": 10886400 }
+Content-Security-Policy: script-src 'self' 'unsafe-inline'; img-src 'self'; report-to csp-group
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html
new file mode 100644
index 0000000000000..61658863a7fb4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test that report-only policies still work with report-to</title>
+  <script src='/resources/testharness.js'></script>
+  <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+  <script>
+    var t1 = async_test("Test that image does not load");
+    async_test(function(t2) {
+    window.addEventListener("securitypolicyviolation", t2.step_func(function(e) {
+        assert_equals(e.blockedURI, "{{location[scheme]}}://{{location[host]}}/content-security-policy/support/fail.png");
+        assert_equals(e.violatedDirective, "img-src");
+        t2.done();
+      }));
+    }, "Event is fired");
+  </script>
+  <img src='/content-security-policy/support/fail.png'
+       onload='t1.done();'
+       onerror='t1.unreached_func("The image should have loaded");'>
+
+  <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=img-src%20%27none%27'></script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html.sub.headers
new file mode 100644
index 0000000000000..990cfafb090a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html.sub.headers
@@ -0,0 +1,7 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: reporting-api-report-only-sends-reports-on-violation={{$id:uuid()}}; Path=/content-security-policy/reporting
+Report-To: { "url": "https://{{host}}:{{ports[https][0]}}/content-security-policy/support/report.py?op=put&reportID={{$id}}", "group": "csp-group", "max-age": 10886400 }
+Content-Security-Policy-Report-Only: script-src 'self' 'unsafe-inline'; img-src 'none'; report-to csp-group
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html
new file mode 100644
index 0000000000000..119a027c4ee4d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test that report-to overrides report-uri. This tests report-uri before report-to in the policy</title>
+  <script src='/resources/testharness.js'></script>
+  <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+  <script>
+    var t1 = async_test("Test that image does not load");
+    async_test(function(t2) {
+    window.addEventListener("securitypolicyviolation", t2.step_func(function(e) {
+        assert_equals(e.blockedURI, "{{location[scheme]}}://{{location[host]}}/content-security-policy/support/fail.png");
+        assert_equals(e.violatedDirective, "img-src");
+        t2.done();
+      }));
+    }, "Event is fired");
+  </script>
+  <img src='/content-security-policy/support/fail.png'
+       onload='t1.unreached_func("The image should not have loaded");'
+       onerror='t1.done();'>
+  <!-- report-to overrides the report-uri so the report goes to a different endpoint and we should not have any reports sent to this endpoint -->
+  <script async defer src='../support/checkReport.sub.js?reportExists=false></script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html.sub.headers
new file mode 100644
index 0000000000000..c696384f34943
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html.sub.headers
@@ -0,0 +1,7 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: reporting-api-report-to-overrides-report-uri-1={{$id:uuid()}}; Path=/content-security-policy/reporting
+Content-Security-Policy: script-src 'self' 'unsafe-inline'; img-src 'none'; report-uri "/content-security-policy/support/report.py?op=put&reportID={{$id}}"; report-to csp-group
+Report-To: { "url": "https://{{host}}:{{ports[https][0]}}/content-security-policy/support/report.py?op=put&reportID={{$id:uuid()}}", "group": "csp-group", "max-age": 10886400 }
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html
new file mode 100644
index 0000000000000..3c4d2446aee51
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test that report-to overrides report-uri. This tests report-uri after report-to in the policy</title>  <meta name=timeout content=long>
+  <script src='/resources/testharness.js'></script>
+  <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+  <script>
+    var t1 = async_test("Test that image does not load");
+    async_test(function(t2) {
+    window.addEventListener("securitypolicyviolation", t2.step_func(function(e) {
+        assert_equals(e.blockedURI, "{{location[scheme]}}://{{location[host]}}/content-security-policy/support/fail.png");
+        assert_equals(e.violatedDirective, "img-src");
+        t2.done();
+      }));
+    }, "Event is fired");
+  </script>
+  <img src='/content-security-policy/support/fail.png'
+       onload='t1.unreached_func("The image should not have loaded");'
+       onerror='t1.done();'>
+  <!-- report-to overrides the report-uri so the report goes to a different endpoint and we should not have any reports sent to this endpoint -->
+  <script async defer src='../support/checkReport.sub.js?reportExists=false></script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html.sub.headers
new file mode 100644
index 0000000000000..2ac676bae5ece
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html.sub.headers
@@ -0,0 +1,7 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: reporting-api-report-to-overrides-report-uri-2={{$id:uuid()}}; Path=/content-security-policy/reporting
+Content-Security-Policy: script-src 'self' 'unsafe-inline'; img-src 'none'; report-to csp-group; report-uri "/content-security-policy/support/report.py?op=put&reportID={{$id}}"
+Report-To: { "url": "https://{{host}}:{{ports[https][0]}}/content-security-policy/support/report.py?op=put&reportID={{$id:uuid()}}", "group": "csp-group", "max-age": 10886400 }
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html
new file mode 100644
index 0000000000000..b2c3adafbe5bb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test that reports using the report-api service are sent when there's a violation</title>
+  <script src='/resources/testharness.js'></script>
+  <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+  <script>
+    var t1 = async_test("Test that image does not load");
+    async_test(function(t2) {
+    window.addEventListener("securitypolicyviolation", t2.step_func(function(e) {
+        assert_equals(e.blockedURI, "{{location[scheme]}}://{{location[host]}}/content-security-policy/support/fail.png");
+        assert_equals(e.violatedDirective, "img-src");
+        t2.done();
+      }));
+    }, "Event is fired");
+  </script>
+  <img src='/content-security-policy/support/fail.png'
+       onload='t1.unreached_func("The image should not have loaded");'
+       onerror='t1.done();'>
+
+  <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=img-src%20%27none%27'></script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html.sub.headers
new file mode 100644
index 0000000000000..ff4b9e6fb7d90
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html.sub.headers
@@ -0,0 +1,7 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: reporting-api-sends-reports-on-violation={{$id:uuid()}}; Path=/content-security-policy/reporting
+Report-To: { "url": "https://{{host}}:{{ports[https][0]}}/content-security-policy/support/report.py?op=put&reportID={{$id}}", "group": "csp-group", "max-age": 10886400 }
+Content-Security-Policy: script-src 'self' 'unsafe-inline'; img-src 'none'; report-to csp-group
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/securitypolicyviolation-idl.html b/tests/wpt/web-platform-tests/content-security-policy/reporting/securitypolicyviolation-idl.html
index 225951285b3a9..237807cc45a89 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/reporting/securitypolicyviolation-idl.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/securitypolicyviolation-idl.html
@@ -38,6 +38,55 @@
     long           lineNumber;
     long           columnNumber;
 };
+
+[
+    Constructor(DOMString type, optional EventInit eventInitDict),
+    Exposed=(Window,Worker)
+] interface Event {
+    readonly attribute DOMString type;
+    readonly attribute EventTarget? target;
+    readonly attribute EventTarget? currentTarget;
+    [MeasureAs=EventComposedPath, CallWith=ScriptState] sequence<EventTarget> composedPath();
+
+    const unsigned short NONE = 0;
+    const unsigned short CAPTURING_PHASE = 1;
+    const unsigned short AT_TARGET = 2;
+    const unsigned short BUBBLING_PHASE = 3;
+    readonly attribute unsigned short eventPhase;
+
+    [Measure] void stopPropagation();
+    [Measure] void stopImmediatePropagation();
+
+    readonly attribute boolean bubbles;
+    readonly attribute boolean cancelable;
+    void preventDefault();
+    readonly attribute boolean defaultPrevented;
+
+    [MeasureAs=EventComposed] readonly attribute boolean composed;
+
+    [Unforgeable] readonly attribute boolean isTrusted;
+
+    [CallWith=ScriptState] readonly attribute DOMHighResTimeStamp timeStamp;
+
+    [Measure] void initEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false);
+
+    // Non-standard APIs
+    [MeasureAs=EventSrcElement] readonly attribute EventTarget srcElement;
+    [MeasureAs=EventReturnValue, CallWith=ScriptState, ImplementedAs=legacyReturnValue] attribute boolean returnValue;
+    [MeasureAs=EventCancelBubble, CallWith=ScriptState] attribute boolean cancelBubble;
+    [MeasureAs=EventPath, CallWith=ScriptState] readonly attribute EventTarget[] path;
+};
+
+[
+    CheckSecurity=Receiver,
+    Exposed=(Window,Worker),
+    ImmutablePrototype
+] interface EventTarget {
+    [Custom=(CallPrologue,CallEpilogue)] void addEventListener(DOMString type, EventListener? listener, optional (AddEventListenerOptions or boolean) options);
+    [Custom=(CallPrologue,CallEpilogue)] void removeEventListener(DOMString type, EventListener? listener, optional (EventListenerOptions or boolean) options);
+    [ImplementedAs=dispatchEventForBindings, RaisesException] boolean dispatchEvent(Event event);
+};
+
 </script>
 <script>
     (function() {
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/iframe-inside-csp.sub.html b/tests/wpt/web-platform-tests/content-security-policy/sandbox/iframe-inside-csp.sub.html
new file mode 100644
index 0000000000000..cd402bdba0198
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/iframe-inside-csp.sub.html
@@ -0,0 +1,18 @@
+<html>
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'self'; connect-src 'self';">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS (1/2): Script can execute","PASS (2/2): Eval works"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+<body>
+  <script>
+    window.onmessage = function(e) {
+      log(e.data);
+    }
+  </script>
+  <iframe src="support/sandboxed-eval.sub.html"></iframe>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html b/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html
new file mode 100644
index 0000000000000..1d6db3cde71cd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["Message"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <script>
+       window.onmessage = function(e) {
+           log(e.data);
+       }
+    </script>
+
+    <iframe src="support/sandboxed-data-iframe.sub.html?sandbox=allow-scripts"></iframe>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts.sub.html b/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts.sub.html
new file mode 100644
index 0000000000000..ae3b376948bb4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts.sub.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["Message"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <script>
+       window.onmessage = function(e) {
+           log(e.data);
+       }
+    </script>
+
+    <iframe src="support/sandboxed-post-message-to-parent.sub.html?sandbox=allow-scripts"></iframe>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty-subframe.sub.html b/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty-subframe.sub.html
new file mode 100644
index 0000000000000..3396e566b8b95
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty-subframe.sub.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS2"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <script>
+       window.onmessage = function(e) {
+           log(e.data);
+       }
+    </script>
+
+    <iframe src="support/sandboxed-data-iframe.sub.html?sandbox="
+            onload="log('PASS2')"></iframe>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty.sub.html b/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty.sub.html
new file mode 100644
index 0000000000000..47034710203a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty.sub.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS2"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <p>This test passes if it does alert pass.</p>
+
+    <script>
+       window.onmessage = function(e) {
+           log(e.data);
+       }
+    </script>
+
+    <iframe src="support/sandboxed-post-message-to-parent.sub.html?sandbox="
+            onload="log('PASS2')"></iframe>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html
new file mode 100644
index 0000000000000..fafd4dc7707ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html
@@ -0,0 +1 @@
+<iframe src="data:text/html,&lt;script&gt;window.top.postMessage(&apos;Message&apos;,&apos;*&apos;);&lt;/script&gt;"></iframe>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html.sub.headers
new file mode 100644
index 0000000000000..a7ea308208d81
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html.sub.headers
@@ -0,0 +1 @@
+Content-Security-Policy: sandbox {{GET[sandbox]}};
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html
new file mode 100644
index 0000000000000..9480e521de21e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html
@@ -0,0 +1,4 @@
+<script>
+  window.parent.postMessage('PASS (1/2): Script can execute', '*');
+  eval("window.parent.postMessage('PASS (2/2): Eval works', '*')");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html.sub.headers
new file mode 100644
index 0000000000000..c7e4e7cc5bd3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html.sub.headers
@@ -0,0 +1 @@
+Content-Security-Policy: sandbox allow-scripts
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html
new file mode 100644
index 0000000000000..ef4b1a0b95a7e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html
@@ -0,0 +1,3 @@
+<script>
+  window.top.postMessage("Message", "*");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html.sub.headers
new file mode 100644
index 0000000000000..a7ea308208d81
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.sub.html.sub.headers
@@ -0,0 +1 @@
+Content-Security-Policy: sandbox {{GET[sandbox]}};
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_1.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_1.js
index 7b6e85210d0b1..9bfe201711a0b 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_1.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_1.js
@@ -1 +1,4 @@
-var dataScriptRan = false;
\ No newline at end of file
+var dataScriptRan = false;
+
+var t_spv = async_test("Test that no report violation event was raised");
+window.addEventListener("securitypolicyviolation", t_spv.unreached_func("Should not have raised any securitypolicyviolation event"));
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_2.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_2.js
index ba586810f5fcd..6e6c15d22352e 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_2.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_2.js
@@ -1,3 +1,5 @@
 test(function () {
             assert_true(dataScriptRan, "data script ran");
-        }, "Verify that data: as script src runs with this policy");
\ No newline at end of file
+        }, "Verify that data: as script src runs with this policy");
+        
+t_spv.done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/addInlineTestsWithDOMManipulation.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/addInlineTestsWithDOMManipulation.js
index cd093ac942343..a5d91dcab0fe3 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/addInlineTestsWithDOMManipulation.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/addInlineTestsWithDOMManipulation.js
@@ -1,4 +1,14 @@
 (function () {
+  var t_spv = async_test("Test that securitypolicyviolation event is fired");
+  var test_count = 2;
+
+  window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+   assert_equals(e.violatedDirective, "script-src");
+   if (--test_count <= 0) {
+    t_spv.done();
+   }
+  }));
+
 
   var dmTest = async_test("DOM manipulation inline tests");
   var attachPoint = document.getElementById('attachHere');
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-allowed.sub.html
new file mode 100644
index 0000000000000..5a8cdec8472e9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-allowed.sub.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'">
+    <title>injected-inline-script-allowed</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["Pass 1 of 2","Pass 2 of 2"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+
+<body>
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+    </script>
+    <script src="support/inject-script.js"></script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-blocked.sub.html
new file mode 100644
index 0000000000000..07e2ae2871c7e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-blocked.sub.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'nonce-abc'; connect-src 'self';">
+    <title>injected-inline-script-blocked</title>
+    <script nonce='abc' src="/resources/testharness.js"></script>
+    <script nonce='abc' src="/resources/testharnessreport.js"></script>
+    <script nonce='abc' src='../support/logTest.sub.js?logs=["violated-directive=script-src",]'></script>
+    <script nonce='abc' src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+
+<body>
+    <script nonce='abc'>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+    </script>
+    <script src="support/inject-script.js"></script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/inlineSuccessTest.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/inlineSuccessTest.js
index ea2be272a206b..1f0d7ae715495 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/inlineSuccessTest.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/inlineSuccessTest.js
@@ -1,3 +1,6 @@
+var t_spv = async_test("Should not fire policy violation events");
+window.addEventListener("securitypolicyviolation", t_spv.unreached_func("Should have not fired any securitypolicyviolation event"));
+
 var inlineRan = false;
 
 onload = function() {
@@ -5,4 +8,5 @@ onload = function() {
         assert_true(inlineRan, 'Unsafe inline script ran.')},
         'Inline script in a script tag should  run with an unsafe-inline directive'
     );
+  t_spv.done();
 }
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/inlineTests.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/inlineTests.js
index 6e76b0a1781dc..0c6e5446041de 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/inlineTests.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/inlineTests.js
@@ -1,4 +1,13 @@
 var t1 = async_test("Inline script block");
 var t2 = async_test("Inline event handler");
 
-onload = function() {t1.done(); t2.done()}
\ No newline at end of file
+onload = function() {t1.done(); t2.done()}
+
+var t_spv = async_test("Should not fire policy violation events");
+var test_count = 2;
+window.addEventListener("securitypolicyviolation", t_spv.step_func(function(e) {
+    assert_equals(e.violatedDirective, "script-src");
+    if (--test_count <= 0) {
+        t_spv.done();
+    }
+}));
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/javascript-window-open-blocked.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/javascript-window-open-blocked.html
index a8dd14f1c89b5..e02d66ae9c9c8 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/javascript-window-open-blocked.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/javascript-window-open-blocked.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Window.open should not open javascript url if not allowed.</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'nonce-abc';">
     <script nonce='abc' src='/resources/testharness.js'></script>
     <script nonce='abc' src='/resources/testharnessreport.js'></script>
 </head>
@@ -15,8 +16,5 @@
 
     window.open('javascript:test(function() { assert_unreached("FAIL")});', 'new');
   </script>
-
-  <script nonce='abc' async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27nonce-abc%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_1.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_1.html
index c83f512bff500..d66253c6a19d4 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_1.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_1.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Inline script should not run without 'unsafe-inline' script-src directive.</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='inlineTests.js'></script>
@@ -15,8 +16,5 @@ <h1>Inline script should not run without 'unsafe-inline' script-src directive, e
     </script>
 
     <img src='doesnotexist.jpg' onerror='t2.step(function() { assert_unreached("Unsafe inline event handler ran.") });'>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_1.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_1.html.sub.headers
deleted file mode 100644
index d91fe1c87f1f5..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_1.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-1_1={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: script-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10.html
index 137a16421db01..a1bfdaeb15bfb 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>data: as script src should not run with a policy that doesn't specify data: as an allowed source</title>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -11,6 +12,11 @@ <h1>data: as script src should not run with a policy that doesn't specify data:
 
     <script>
         var dataScriptRan = false;
+        var t_spv = async_test("Test that securitypolicyviolation event is fired");
+        
+        window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+            assert_equals(e.violatedDirective, "script-src");
+        }));
     </script>
 
     <!-- This is our test case, but we don't expect it to actually execute if CSP is working. -->
@@ -21,7 +27,5 @@ <h1>data: as script src should not run with a policy that doesn't specify data:
             assert_false(dataScriptRan, "data script ran");
         }, "Verify that data: as script src doesn't run with this policy");
     </script>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=default-src%20%27self%27+%27unsafe-inline%27'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10.html.sub.headers
deleted file mode 100644
index 6c0c0fd0a76cd..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-1_10={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: default-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10_1.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10_1.html
index f1bfee2000ae4..a1e2f72cdb739 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10_1.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10_1.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>data: as script src should run with a policy that specifies data: as an allowed source but not 'unsafe-inline'</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' data:;">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -14,7 +15,5 @@ <h1>data: as script src should run with a policy that specifies data: as an allo
     <script src="data:text/javascript;charset=utf-8;base64,ZGF0YVNjcmlwdFJhbiA9IHRydWU7"></script>
 
     <script src="10_1_support_2.js"></script>
-
-    <script async defer src='../support/checkReport.sub.js?reportExists=false'></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10_1.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10_1.html.sub.headers
deleted file mode 100644
index dfb6f345fc7db..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10_1.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-1_10_1={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: script-src 'self' data:; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2.html
index a41310da9e759..a68945cb85373 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Inline script should not run without 'unsafe-inline' script-src directive.</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src *;">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='inlineTests.js'></script>
@@ -15,8 +16,5 @@ <h1>Inline script should not run without 'unsafe-inline' script-src directive, e
     </script>
 
     <img src='doesnotexist.jpg' onerror='t2.step(function() { assert_unreached("Unsafe inline event handler ran.") });'>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2.html.sub.headers
deleted file mode 100644
index 4cf9c6950518e..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-1_2={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: script-src *; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2_1.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2_1.html
index 255f5df9ce19e..2641c867f638f 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2_1.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2_1.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Inline script attached by DOM manipulation should not run without an 'unsafe-inline' script-src policy, even with default-src *</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src *;">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -16,8 +17,5 @@ <h1>Inline script attached by DOM manipulation should not run without an 'unsafe
     <div id=emptyDiv></div>
 
     <script src="addInlineTestsWithDOMManipulation.js"></script>
-
-    <script async defer src="../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20*"></script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2_1.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2_1.html.sub.headers
deleted file mode 100644
index 9c58f0efcd599..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2_1.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-1_2_1={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: script-src *; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_3.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_3.html
index 30e6f6870a812..bf7a6921b4d0d 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_3.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_3.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Positive test case: Inline script should run 'unsafe-inline' script-src directive.</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='inlineSuccessTest.js'></script>
@@ -13,8 +14,5 @@ <h1>Positive test case: Inline script should run 'unsafe-inline' script-src dire
     <script>
       inlineRan = true;
     </script>
-
-    <script async defer src='../support/checkReport.sub.js?reportExists=false'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_3.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_3.html.sub.headers
deleted file mode 100644
index 8227c6272dcd4..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_3.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-1_3={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4.html
index 5293183d30076..bfc66b2a8d048 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>eval() should not run without 'unsafe-eval' script-src directive.</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -10,6 +11,11 @@ <h1>eval() should not run without 'unsafe-eval' script-src directive.</h1>
     <div id='log'></div>
 
    	<script>
+        var t_spv = async_test("Test that securitypolicyviolation event is fired");
+        
+        window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+            assert_equals(e.violatedDirective, "script-src");
+        }));
 
         var evalRan = false;
 
@@ -18,8 +24,5 @@ <h1>eval() should not run without 'unsafe-eval' script-src directive.</h1>
         test(function() {assert_false(evalRan);})
 
     </script>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27+%27unsafe-inline%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4.html.sub.headers
deleted file mode 100644
index 28ad14b609d92..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-1_4={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_1.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_1.html
index 31664a1698742..522b9c5f7c887 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_1.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_1.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>setTimeout() and setInterval() should not run without 'unsafe-eval' script-src directive.</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';"> 
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -12,15 +13,21 @@ <h1>setTimeout() and setInterval() should not run without 'unsafe-eval' script-s
    	<script>
         var t1 = async_test("window.setTimeout()");
         var t2 = async_test("window.setInterval()");
+        var t_spv = async_test("Test that securitypolicyviolation event is fired");
+        var test_count = 2;
+        
+        window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+            assert_equals(e.violatedDirective, "script-src");
+            if (--test_count <= 0) {
+                t_spv.done();
+            }
+        }));
+
 
         onload = function() {t1.done(); t2.done()}
 
         window.setTimeout('t1.step(function() {assert_unreached("window.setTimeout() ran without unsafe-eval.")})',0);
         window.setInterval('t2.step(function() {assert_unreached("window.setInterval() ran without unsafe-eval.")})',0);
-
     </script>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27+%27unsafe-eval%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_1.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_1.html.sub.headers
deleted file mode 100644
index 6bd48d1ded741..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_1.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-1_4_1={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_2.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_2.html
index 31382936f474f..0ee6f587c5ce1 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_2.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_2.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <title>Function() called as a constructor should throw without 'unsafe-eval' script-src directive.</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
 </head>
@@ -10,6 +11,12 @@ <h1>Function() called as a constructor should throw without 'unsafe-eval' script
     <div id='log'></div>
 
    	<script>
+   	    var t_spv = async_test("Test that securitypolicyviolation event is fired");
+        
+        window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+            assert_equals(e.violatedDirective, "script-src");
+        }));
+   	    
 
         test(function() {
             assert_throws(
@@ -20,8 +27,5 @@ <h1>Function() called as a constructor should throw without 'unsafe-eval' script
         })}, "Unsafe eval ran in Function() constructor.");
 
     </script>
-
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27+%27unsafe-inline%27'></script>
-
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_2.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_2.html.sub.headers
deleted file mode 100644
index 314849bb972aa..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_2.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: script-src-1_4_2={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html
index 75ff3424c05b4..70b314572783c 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html
@@ -22,7 +22,5 @@
       t.done();
     });
   </script>
-
-  <script nonce="abc" async defer src='../support/checkReport.sub.js?reportExists=false'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers
index 36203b7643a54..89f99e621f830 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers
@@ -2,6 +2,5 @@ Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
-Set-Cookie: script-src-multiple-policies-multiple-hashing-algorithms={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: script-src 'sha256-EpVP4fTImWaRzBRBw/wrdfLhGTe/1U+CaBP1LNeKUIE=' 'nonce-abc'; report-uri ../support/report.py?op=put&reportID={{$id}}
-Content-Security-Policy: script-src 'sha384-skw7BVxHbmE2umPGMd1kX+ye6qBeHAb875erPoD8ilKv1LkjKR+WFi7N85ORMdhS' 'nonce-abc'; report-uri ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
+Content-Security-Policy: script-src 'sha256-EpVP4fTImWaRzBRBw/wrdfLhGTe/1U+CaBP1LNeKUIE=' 'nonce-abc';
+Content-Security-Policy: script-src 'sha384-skw7BVxHbmE2umPGMd1kX+ye6qBeHAb875erPoD8ilKv1LkjKR+WFi7N85ORMdhS' 'nonce-abc';
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html
index 34fed6d94b387..da9e60f874305 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html
@@ -22,7 +22,5 @@
       t.done();
     });
   </script>
-
-  <script nonce="abc" async defer src='../support/checkReport.sub.js?reportExists=false'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers
index 114c560b28c50..83fe7f7005e45 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers
@@ -2,6 +2,5 @@ Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
-Set-Cookie: script-src-multiple-policies-multiple-hashing-algorithms-work={{$id:uuid()}}; Path=/content-security-policy/script-src/
-Content-Security-Policy: script-src 'sha256-EpVP4fTImWaRzBRBw/wrdfLhGTe/1U+CaBP1LNeKUIE=' 'nonce-abc'; report-uri ../support/report.py?op=put&reportID={{$id}}
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; report-uri ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
+Content-Security-Policy: script-src 'sha256-EpVP4fTImWaRzBRBw/wrdfLhGTe/1U+CaBP1LNeKUIE=' 'nonce-abc';
+Content-Security-Policy: script-src 'self' 'unsafe-inline';
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-overrides-default-src.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-overrides-default-src.sub.html
new file mode 100644
index 0000000000000..5a0dfe50e1593
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-overrides-default-src.sub.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="default-src about:; script-src 'self' 'unsafe-inline'; style-src 'self'; connect-src 'self';">
+    <title>script-src-overrides-default-src</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS 1 of 2","PASS 2 of 2"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+       });
+    </script>
+</head>
+
+<body onload="log(&apos;PASS 2 of 2&apos;)">
+    <script>
+        log('PASS 1 of 2');
+
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html
index f0f7bcb7a04d2..16428b1a4de67 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html
@@ -8,6 +8,11 @@
 </head>
 <body>
   <script nonce="abc">
+    var t_spv = async_test("Should fire securitypolicyviolation event");
+    window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+      assert_equals(e.violatedDirective, "script-src");
+      assert_equals(e.disposition, "report");
+    }));
     var externalRan = false;
   </script>
   <script src='./externalScript.js'
@@ -16,8 +21,5 @@
     test(function() {
       assert_true(externalRan, 'External script ran.');
     }, 'External script in a script tag with matching SRI hash should run.');
-  </script>
-
-  <script nonce="abc" async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27nonce-abc%27'></script>
-</body>
+  </script></body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers
index 0ccfd507f65b1..7f03464d4d3a0 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers
@@ -2,6 +2,5 @@ Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
-Set-Cookie: script-src-report-only-policy-works-with-external-hash-policy={{$id:uuid()}}; Path=/content-security-policy/script-src/
 Content-Security-Policy: script-src 'sha256-wIc3KtqOuTFEu6t17sIBuOswgkV406VJvhSk79Gw6U0=' 'nonce-abc'
-Content-Security-Policy-Report-Only: script-src 'nonce-abc'; report-uri ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
+Content-Security-Policy-Report-Only: script-src 'nonce-abc';
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html
index 82a88791bd5c6..9ae66611ea52e 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html
@@ -27,7 +27,5 @@
       t.done();
     });
   </script>
-
-  <script nonce="abc" async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27nonce-abc%27'></script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers
index eaf175a878593..1237c247a6783 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers
@@ -2,6 +2,5 @@ Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
-Set-Cookie: script-src-report-only-policy-works-with-hash-policy={{$id:uuid()}}; Path=/content-security-policy/script-src/
 Content-Security-Policy: script-src 'sha256-EpVP4fTImWaRzBRBw/wrdfLhGTe/1U+CaBP1LNeKUIE=' 'nonce-abc'
-Content-Security-Policy-Report-Only: script-src 'nonce-abc'; report-uri ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
+Content-Security-Policy-Report-Only: script-src 'nonce-abc';
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-wildcards-disallowed.html
similarity index 95%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-wildcards-disallowed.html
index 2a94692ee1500..7bf3d89b6726d 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-wildcards-disallowed.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
 <html>
     <head>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'nonce-nonce' *; connect-src 'self';">
     <title>script-src disallowed wildcard use</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     </head>
     <body>
-    <!-- enforcing policy:
-script-src 'nonce-nonce' *; connect-src 'self';
--->
     <script nonce="nonce">
         var t1 = async_test('data: URIs should not match *');
         t1.step(function() {
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-allowed.sub.html
similarity index 67%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-allowed.sub.html
index a7a217448a0db..c46a99136d8b1 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-allowed.sub.html
@@ -3,16 +3,17 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'nonce-abc' 'sha256-IFmozo9WnnsMXVl/Ka8XzJ3Nd8yzS2zA2ME0mwtd+Ck=' 'sha256-jSpTmJKcrnHttKdYM/wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn/UmK7v/K77t+fvfxA89QT/K9qPNyE=' 'sha256-K+7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self';">
     <title>scripthash-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/content-security-policy/support/alertAssert.sub.js?alerts=%5B%22PASS%20(1%2F4)%22%2C%22PASS%20(2%2F4)%22%2C%22PASS%20(3%2F4)%22%2C%22PASS%20(4%2F4)%22%5D">
-
-
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("Fail");
+        });
     </script>
-    <!-- enforcing policy:
-script-src 'self' 'sha256-IFmozo9WnnsMXVl/Ka8XzJ3Nd8yzS2zA2ME0mwtd+Ck=' 'sha256-jSpTmJKcrnHttKdYM/wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn/UmK7v/K77t+fvfxA89QT/K9qPNyE=' 'sha256-K+7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self';
--->
+    
     <script>
         alert_assert('PASS (1/4)');
 
@@ -36,7 +37,6 @@
         This tests the effect of a valid script-hash value. It passes if no CSP violation is generated, and the alert_assert() is executed.
     </p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-basic-blocked.sub.html
similarity index 83%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-basic-blocked.sub.html
index ac7b2c02f9d20..d254053ecedad 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-basic-blocked.sub.html
@@ -3,10 +3,17 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'nonce-abc' 'sha256-k7iO9DPkNQ7PcwPP+8XyYuRiCJ0p76Ofveol9g3mFNs=' 'sha256-EgE/bwVJ+ZLL9F5hNjDqD4C7nlFFrdDaKeNIJ2cUem4='; connect-src 'self';">
     <title>scripthash-basic-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="../support/logTest.sub.js?logs=[]"></script>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("Fail");
+        });
+    </script>
+    
     <script>
         var t_alert = async_test('Expecting alerts: ["PASS (1/1)"]');
         var expected_alerts = ["PASS (1/1)"];
@@ -33,9 +40,6 @@
         }
 
     </script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'sha1-Au4uYFbkf7OYd+ACMnKq96FN3qo='; connect-src 'self';
--->
     <script>
         alert_assert('PASS (1/1)');
 
@@ -63,7 +67,6 @@
         This tests the effect of a valid script-hash value, with one valid script and several invalid ones. It passes if one alert is executed and a CSP violation is reported.
     </p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;sha1-Au4uYFbkf7OYd+ACMnKq96FN3qo=&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-default-src.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-default-src.sub.html
new file mode 100644
index 0000000000000..6025a67179fe2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-default-src.sub.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+    <head>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'nonce-abc' 'sha256-sc3CeiHrlck5tH2tTC4MnBYFnI9D5zp8f9odqnmGQjE='; connect-src 'self';">
+    <title>script-hash allowed from default-src</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script nonce='abc'>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            test(function() { assert_unreached("Should not have fired event")});
+        });
+    </script>
+    
+    <script>done();</script>
+    </head>
+
+    <body>
+    <div id="log"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-ignore-unsafeinline.sub.html
similarity index 80%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-ignore-unsafeinline.sub.html
index 545099e080f55..d7af328f4e3e4 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-ignore-unsafeinline.sub.html
@@ -3,10 +3,13 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'sha256-k7iO9DPkNQ7PcwPP+8XyYuRiCJ0p76Ofveol9g3mFNs=' 'sha256-EgE/bwVJ+ZLL9F5hNjDqD4C7nlFFrdDaKeNIJ2cUem4=' 'sha256-lxHfHAe5I15v8qaArcZ5WiKmLU4CjV+3tJeQUqSIWBk='; connect-src 'self';">
+    
     <title>scripthash-ignore-unsafeinline</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="../support/logTest.sub.js?logs=[]"></script>
+    <script>window.addEventListener('securitypolicyviolation', function(e) { alert_assert("Fail"); })</script>
     <script>
         var t_alert = async_test('Expecting alerts: ["PASS (1/1)"]');
         var expected_alerts = ["PASS (1/1)"];
@@ -33,9 +36,6 @@
         }
 
     </script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'sha1-Au4uYFbkf7OYd+ACMnKq96FN3qo=' 'unsafe-inline'; connect-src 'self';
--->
     <script>
         alert_assert('PASS (1/1)');
 
@@ -51,7 +51,6 @@
         This tests that a valid hash value disables inline JavaScript, even if &apos;unsafe-inline&apos; is present.
     </p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;sha1-Au4uYFbkf7OYd+ACMnKq96FN3qo=&apos;%20&apos;unsafe-inline&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-unicode-normalization.sub.html
similarity index 85%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-unicode-normalization.sub.html
index bd1e0365c2e17..0c303630331cd 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-unicode-normalization.sub.html
@@ -3,13 +3,10 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'nonce-nonceynonce' 'sha256-9UFeeZbvnMa0tLNu76v96T4Hh+UtDWHm2lPQJoTWb9c='; connect-src 'self';">
     <title>scripthash-unicode-normalization</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-
-    <!-- enforcing policy:
-script-src 'self' 'nonce-nonceynonce' 'sha256-dWTP4Di8KBjaiXvQ5mRquI9OoBSo921ahYxLfYSiuT8='; connect-src 'self';
--->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
@@ -21,6 +18,11 @@
         against the spec. This test, therefore, validates that the scripts have
         *different* hash values. -->
     <script nonce="nonceynonce">
+      var t_spv = async_test("Should fire securitypolicyviolation");
+      window.addEventListener('securitypolicyviolation', t_spv.step_func_done(function(e) {
+          assert_equals(e.violatedDirective, "script-src");
+      }));
+      
       var matchingContent = 'Å';
       var nonMatchingContent = 'Å';
 
@@ -65,7 +67,6 @@
         This tests Unicode normalization. While appearing the same, the strings in the scripts are different Unicode points, but through normalization, should be the same when the hash is taken.
     </p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-allowed.sub.html
similarity index 88%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-allowed.sub.html
index c76896bfe68a6..46fdabd62c54b 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-allowed.sub.html
@@ -3,6 +3,7 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'nonce-noncynonce' 'nonce-noncy+/nonce='; connect-src 'self';">
     <title>scriptnonce-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -15,6 +16,10 @@
 
     </script>
     <script nonce="noncynonce">
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("Fail");
+        });
+
         var t_alert = async_test('Expecting alerts: ["PASS (1/2)","PASS (2/2)"]');
         var expected_alerts = ["PASS (1/2)", "PASS (2/2)"];
 
@@ -58,7 +63,6 @@
         This tests the effect of a valid script-nonce value. It passes if no CSP violation is generated and the alerts are executed.
     </p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html
similarity index 84%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html
index 2b333cbeaded9..94a39973af274 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-and-scripthash.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html
@@ -3,6 +3,7 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'sha256-LS8v1E1Ff0Hc8FobgWKNKY3sbW4rljPlZNQHyyutfKU=' 'nonce-nonceynonce'; connect-src 'self';">
     <title>scriptnonce-and-scripthash</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -12,11 +13,14 @@
                 assert_unreached(msg)
             });
         }
-
     </script>
     <script nonce="nonceynonce">
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("violated-directive=" + e.violatedDirective);
+        });
+    
         var t_alert = async_test('Expecting alerts: ["PASS (1/3)","PASS (2/3)","PASS (3/3)"]');
-        var expected_alerts = ["PASS (1/3)", "PASS (2/3)", "PASS (3/3)"];
+        var expected_alerts = ["PASS (1/3)", "PASS (2/3)", "PASS (3/3)", "violated-directive=script-src", "violated-directive=script-src"];
 
         function alert_assert(msg) {
             t_alert.step(function() {
@@ -70,7 +74,6 @@
         This tests the combined use of script hash and script nonce. It passes if a CSP violation is generated and the three alerts show PASS.
     </p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;sha1-MfuEFRkC2LmR31AMy9KW2ZLDegA=&apos;%20&apos;sha1-p70t5PXyndLfjKNjbyBBOL1gFiM=&apos;%20&apos;nonce-nonceynonce&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-basic-blocked.sub.html
similarity index 70%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-basic-blocked.sub.html
index 4815ca1001322..db94c1c5f4bb8 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-basic-blocked.sub.html
@@ -3,13 +3,11 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'nonce-noncynonce'; connect-src 'self';">
     <title>scriptnonce-basic-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["PASS (closely-quoted nonce)","PASS (nonce w/whitespace)"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'nonce-noncynonce'; connect-src 'self';
--->
+    <script src='../support/alertAssert.sub.js?alerts=["PASS (closely-quoted nonce)","PASS (nonce w/whitespace)", "violated-directive=script-src", "violated-directive=script-src", "violated-directive=script-src"]'></script>
     <script nonce="noncynonce">
         alert_assert('PASS (closely-quoted nonce)');
 
@@ -17,6 +15,9 @@
     <script nonce="   noncynonce    ">
         alert_assert('PASS (nonce w/whitespace)');
 
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("violated-directive=" + e.violatedDirective);
+        });
     </script>
     <script nonce="noncynonce noncynonce">
         alert_assert('FAIL (1/3)');
@@ -37,7 +38,6 @@
         This tests the effect of a valid script-nonce value. It passes if a CSP violation is generated, and the two PASS alerts are executed.
     </p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;nonce-noncynonce&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html
similarity index 80%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html
index 0d48b486d4fd3..18a6899a5cd16 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-ignore-unsafeinline.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html
@@ -3,6 +3,7 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'nonce-noncynonce' 'nonce-noncy+/nonce=' 'unsafe-inline'; connect-src 'self';">
     <title>scriptnonce-ignore-unsafeinline</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -13,10 +14,13 @@
             });
         }
 
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("violated-directive=" + e.violatedDirective);
+        });
     </script>
     <script nonce='noncynonce'>
-        var t_alert = async_test('Expecting alerts: ["PASS (1/2)","PASS (2/2)"]');
-        var expected_alerts = ["PASS (1/2)", "PASS (2/2)"];
+        var t_alert = async_test('Expecting alerts: ["PASS (1/2)","PASS (2/2)", "violated-directive=script-src"]');
+        var expected_alerts = ["PASS (1/2)", "PASS (2/2)", "violated-directive=script-src"];
 
         function alert_assert(msg) {
             t_alert.step(function() {
@@ -49,7 +53,6 @@
     </script>
     <script nonce="noncynonce">
         alert_assert('PASS (1/2)');
-
     </script>
     <script nonce="noncy+/nonce=">
         alert_assert('PASS (2/2)');
@@ -66,7 +69,6 @@
         This tests that a valid nonce disables inline JavaScript, even if &apos;unsafe-inline&apos; is present.
     </p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;nonce-noncynonce&apos;%20&apos;nonce-noncy+/nonce=&apos;%20&apos;unsafe-inline&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-redirect.sub.html
similarity index 88%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-redirect.sub.html
index a17f1fb5c30f9..7e4e848375d75 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-redirect.sub.html
@@ -3,6 +3,7 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'nonce-noncynonce'; connect-src 'self';">
     <title>scriptnonce-redirect</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -13,6 +14,9 @@
             });
         }
 
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("Fail");
+        });
     </script>
     <script nonce="noncynonce">
         var t_alert = async_test('Expecting alerts: ["PASS"]');
@@ -53,7 +57,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html
new file mode 100644
index 0000000000000..eea201865aa42
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'nonce-abc'; connect-src 'self';">
+    <title>srcdoc-doesnt-bypass-script-src</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=script-src"]'></script>
+</head>
+
+<body>
+ 
+    <script nonce='abc'>
+        window.onmessage = function(e) {
+          log(e.data);
+        }
+        
+        var i = document.createElement('iframe');
+        i.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+        
+        i.srcdoc = "<sc" + "ript nonce='abc'>" + 
+                     "window.addEventListener('securitypolicyviolation', function(e) {" + 
+                       "window.parent.postMessage('violated-directive=' + e.violatedDirective, '*');});" +
+                   "</scr" + "ipt>" + 
+                   "<scr" + "ipt>window.parent.log('FAIL')</scr" + "ipt>";
+        document.body.appendChild(i);
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/inject-script.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/inject-script.js
new file mode 100644
index 0000000000000..c04033c46f09b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/inject-script.js
@@ -0,0 +1,5 @@
+document.write("<script>log('Pass 1 of 2');</script>");
+
+var s = document.createElement('script');
+s.textContent = "log('Pass 2 of 2');";
+document.body.appendChild(s);
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/post-message.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/post-message.js
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/post-message.js
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/post-message.js
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-eval.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-eval.js
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-eval.js
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-eval.js
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-eval.js.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-eval.js.sub.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-eval.js.sub.headers
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-eval.js.sub.headers
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-function-function.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-function-function.js
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-function-function.js
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-function-function.js
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-function-function.js.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-function-function.js.sub.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-function-function.js.sub.headers
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-function-function.js.sub.headers
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-importscripts.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-importscripts.js
similarity index 54%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-importscripts.js
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-importscripts.js
index 65ec6f44624b1..0204de32cf19f 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-importscripts.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-importscripts.js
@@ -1,5 +1,5 @@
 try {
-    importScripts("/content-security-policy/blink-contrib/resources/post-message.js");
+    importScripts("/content-security-policy/support/post-message.js");
     postMessage("importScripts allowed");
 } catch (e) {
     postMessage("importScripts blocked");
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-importscripts.js.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-importscripts.js.sub.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-importscripts.js.sub.headers
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-importscripts.js.sub.headers
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-set-timeout.js b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-set-timeout.js
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-set-timeout.js
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-set-timeout.js
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-set-timeout.js.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-set-timeout.js.sub.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/worker-set-timeout.js.sub.headers
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-set-timeout.js.sub.headers
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-eval-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-eval-blocked.sub.html
similarity index 58%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-eval-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/worker-eval-blocked.sub.html
index ac96e0f4d7fee..9a264f2a240bf 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-eval-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-eval-blocked.sub.html
@@ -3,14 +3,12 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>worker-eval-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["eval blocked"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'self'; connect-src 'self';
--->
+    <script src='../support/logTest.sub.js?logs=["eval blocked"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
 </head>
 
 <body>
@@ -20,18 +18,21 @@
     policy does not set a report-uri (although this parent
     resource does).</p>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('Fail');
+        });
+    
         try {
-            var worker = new Worker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/worker-eval.js');
+            var worker = new Worker('/content-security-policy/script-src/support/worker-eval.js');
             worker.onmessage = function(event) {
-                alert_assert(event.data);
+                log(event.data);
             };
         } catch (e) {
-            alert_assert(e);
+            log(e);
         }
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-function-function-blocked.sub.html
similarity index 56%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/worker-function-function-blocked.sub.html
index 1db574780dc69..8c1df9f667967 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-function-function-blocked.sub.html
@@ -3,15 +3,12 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>worker-function-function-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src='../support/alertAssert.sub.js?alerts=["Function() function blocked"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'self' 'unsafe-inline'; connect-src 'self';
--->
-
+    <script src='../support/logTest.sub.js?logs=["Function() function blocked"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
 </head>
 
 <body>
@@ -21,18 +18,20 @@
     policy does not set a report-uri (although this parent
     resource does).</p>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('Fail');
+        });
         try {
-            var worker = new Worker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/worker-function-function.js');
+            var worker = new Worker('/content-security-policy/script-src/support/worker-function-function.js');
             worker.onmessage = function(event) {
-                alert_assert(event.data);
+                log(event.data);
             };
         } catch (e) {
-            alert_assert(e);
+            log(e);
         }
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts-blocked.sub.html
similarity index 70%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts-blocked.sub.html
index 9ec49c03025e6..28906138069e2 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts-blocked.sub.html
@@ -3,23 +3,22 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';">
     <title>worker-importscripts-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-eval' 'unsafe-inline' 127.0.0.1:8000; connect-src 'self';
--->
-    <script></script>
 </head>
 
 <body>
     <script>
-        window.wasPostTestScriptParsed = true;
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('Fail');
+        });
         var result = '';
         try {
-            var worker = new Worker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/worker-importscripts.js');
+            var worker = new Worker('/content-security-policy/script-src/support/worker-importscripts.js');
             worker.onmessage = function(event) {
                 result = event.data;
                 test(function() {
@@ -37,7 +36,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-script-src.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-script-src.sub.html
new file mode 100644
index 0000000000000..da7771b9c4bef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-script-src.sub.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self';">
+    <title>worker-script-src</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+
+<body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('Fail');
+        });
+        try {
+            var foo = new Worker('/content-security-policy/script-src/support/post-message.js');
+            foo.onmessage = function(event) {
+                log("PASS");
+            };
+        } catch (e) {
+            log(e);
+        }
+
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout-blocked.sub.html
similarity index 67%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout-blocked.sub.html
index 119121ca51c5f..5f93433416b1a 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout-blocked.sub.html
@@ -3,21 +3,21 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'self' 'unsafe-eval'; connect-src 'self';">
     <title>worker-set-timeout-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script src='../support/alertAssert.sub.js?alerts=["setTimeout blocked"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'self' 'unsafe-inline'; connect-src 'self';
--->
-
 </head>
 
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log('Fail');
+        });
         try {
-            var worker = new Worker('http://{{host}}:{{ports[http][0]}}/content-security-policy/blink-contrib/resources/worker-set-timeout.js');
+            var worker = new Worker('/content-security-policy/script-src/support/worker-set-timeout.js');
             worker.onmessage = function(event) {
                 alert_assert(event.data);
             };
@@ -27,7 +27,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/injected-inline-style-allowed.sub.html
similarity index 63%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/injected-inline-style-allowed.sub.html
index f52289e49648a..e91c4e46ac7df 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/injected-inline-style-allowed.sub.html
@@ -3,33 +3,38 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>injected-inline-style-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS: 2 stylesheets on the page."]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body>
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+       });
+    </script>
+
     <div id="test1">
         FAIL 1/2
     </div>
+    
     <div id="test2">
         FAIL 2/2
     </div>
-    <script src="resources/inject-style.js"></script>
+    
+    <script src="support/inject-style.js"></script>
     <script>
         if (document.styleSheets.length === 2)
             log("PASS: 2 stylesheets on the page.");
         else
-            document.write("FAIL: " + document.styleSheets.length + " stylesheets on the page (should be 2).");
+            log("FAIL: " + document.styleSheets.length + " stylesheets on the page (should be 2).");
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/injected-inline-style-blocked.sub.html
similarity index 56%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/injected-inline-style-blocked.sub.html
index 1ed46cb6532d0..d7e7de22cf601 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-style-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/injected-inline-style-blocked.sub.html
@@ -3,30 +3,34 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>injected-inline-style-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=style-src","PASS"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body>
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+       });
+    </script>
+            
     <div id="test1">
         PASS 1/2
     </div>
     <div id="test2">
         PASS 2/2
     </div>
-    <script src="resources/inject-style.js"></script>
+    
+    <script src="support/inject-style.js"></script>
     <script>
         log(document.styleSheets.length == 0 ? "PASS" : "FAIL");
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=style-src%20&apos;none&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html
similarity index 92%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html
index efb5043ade478..7fdd5f6fb0c5b 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed-while-cloning-objects.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html
@@ -3,15 +3,15 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>inline-style-allowed-while-cloning-objects</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="../support/logTest.sub.js?logs=[]"></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <script>
+        var t = async_test("Test that violation report event was fired");
+        window.addEventListener("securitypolicyviolation", t.step_func_done(function(e) {
+            assert_equals(e.violatedDirective, "style-src");
+        }));
         window.onload = function() {
             window.nodes = document.getElementById('nodes');
             window.node1 = document.getElementById('node1');
@@ -122,7 +122,6 @@
         Yet another div.
     </div>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=style-src%20&apos;self&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed.sub.html
similarity index 69%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed.sub.html
index bf5ac125d259e..b0aa211b94dcc 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed.sub.html
@@ -3,14 +3,18 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';">
     <title>inline-style-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+       });
+    </script>
+    
     <style>
         .target {
             background-color: blue;
@@ -25,7 +29,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-allowed.sub.html
similarity index 67%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-allowed.sub.html
index ab446040a60c0..048e4067c5ecb 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-allowed.sub.html
@@ -3,23 +3,26 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';">
     <title>inline-style-attribute-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body style="background-color: blue;">
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+       });
+    </script>
+
     <script>
         log(document.body.style.length > 0 ? 'PASS' : 'FAIL');
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-blocked.sub.html
similarity index 56%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-blocked.sub.html
index 90efe9fe7e16a..e2d84915cf0e4 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-blocked.sub.html
@@ -3,23 +3,25 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';">
     <title>inline-style-attribute-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=style-src","PASS"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+       });
+    </script>
 </head>
-
 <body style="background-color: blue;">
+    
     <script>
         log(document.body.style.length > 0 ? 'FAIL' : 'PASS');
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=style-src%20&apos;none&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-on-html.sub.html
similarity index 79%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-on-html.sub.html
index b002af987d4f6..91faf091663d8 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-attribute-on-html.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-on-html.sub.html
@@ -1,17 +1,18 @@
 <!DOCTYPE html>
+<script>
+    window.addEventListener('securitypolicyviolation', function(e) {
+        log("Fail");
+    });
+</script>
 <html style="background-color: blue;">
-
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <meta http-equiv="Content-Security-Policy" content="style-src 'self'">
+    <meta http-equiv="Content-Security-Policy" content="style-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'">
     <title>inline-style-attribute-on-html</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body>
@@ -22,7 +23,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-blocked.sub.html
similarity index 68%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-blocked.sub.html
index 3f7756e44985a..3f34437dffdef 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/inline-style-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-blocked.sub.html
@@ -3,14 +3,17 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';">
     <title>inline-style-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
+    <script>
+       window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+       });
+    </script>
     <style>
         .target {
             background-color: blue;
@@ -25,7 +28,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=style-src%20&apos;none&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/resources/allowed.css b/tests/wpt/web-platform-tests/content-security-policy/style-src/resources/allowed.css
new file mode 100644
index 0000000000000..35a89982175fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/resources/allowed.css
@@ -0,0 +1,3 @@
+#test {
+  color: green;
+}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/style-allowed.sub.html
similarity index 68%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/style-allowed.sub.html
index 176a8e3eff3c6..fd4dfe63a88ed 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/style-allowed.sub.html
@@ -3,14 +3,17 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src *; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';">
     <title>style-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src *; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+    </script>    
     <link rel="stylesheet" href="resources/blue.css">
 </head>
 
@@ -20,7 +23,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/style-blocked.sub.html
similarity index 56%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/style-blocked.sub.html
index 847e05b6ac62c..4e590722d57a8 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/style-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/style-blocked.sub.html
@@ -3,14 +3,17 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';">
     <title>style-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=style-src","PASS"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+    </script>    
     <link rel="stylesheet" href="resources/blue.css">
 </head>
 
@@ -20,7 +23,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=style-src%20&apos;none&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-allowed.sub.html
similarity index 89%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-allowed.sub.html
index 282b1850257d3..90b647aa7618c 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-allowed.sub.html
@@ -3,11 +3,16 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'self' 'sha256-pAKi9r4/WB7fHydbE3F3t8i8602ij2JN8zHJpL2T5BM=' 'sha256-hndjYvzUzy2Ykuad81Cwsl1FOXX/qYs/aDVyUyNZwBw=' 'sha384-bSVm1i3sjPBRM4TwZtYTDjk9JxZMExYHWbFmP1SxDhJH4ue0Wu9OPOkY5hcqRcSt' 'sha512-440MmBLtj9Kp5Bqloogn9BqGDylY8vFsv5/zXL1zH2fJVssCoskRig4gyM+9KqwvCSapSz5CVoUGHQcxv43UQg=='; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>stylehash-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("Fail");
+        });
+    
         var t_alert = async_test('Expecting alerts: ["PASS (1/4): The \'#p1\' element\'s text is green, which means the style was correctly applied.","PASS (2/4): The \'#p2\' element\'s text is green, which means the style was correctly applied.","PASS (3/4): The \'#p3\' element\'s text is green, which means the style was correctly applied.","PASS (4/4): The \'#p4\' element\'s text is green, which means the style was correctly applied."]');
         var expected_alerts = ["PASS (1/4): The '#p1' element's text is green, which means the style was correctly applied.", "PASS (2/4): The '#p2' element's text is green, which means the style was correctly applied.", "PASS (3/4): The '#p3' element's text is green, which means the style was correctly applied.", "PASS (4/4): The '#p4' element's text is green, which means the style was correctly applied."];
 
@@ -71,7 +76,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-basic-blocked.sub.html
similarity index 81%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-basic-blocked.sub.html
index 274db01403c23..d9f0fbf653eac 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-basic-blocked.sub.html
@@ -3,13 +3,18 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'self' 'sha256-FSRZotz4y83Ib8ZaoVj9eXKaeWXVUawM8zAPfYeYySs='; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>stylehash-basic-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script>
-        var t_alert = async_test('Expecting alerts: ["PASS: The \'p\' element\'s text is green, which means the style was correctly applied."]');
-        var expected_alerts = ["PASS: The 'p' element's text is green, which means the style was correctly applied."];
+        window.addEventListener('securitypolicyviolation', function(e) {
+            alert_assert("violated-directive=" + e.violatedDirective);
+        });
+    
+        var t_alert = async_test('Expecting alerts: ["PASS: The \'p\' element\'s text is green, which means the style was correctly applied.", "violated-directive=style-src"]');
+        var expected_alerts = ["PASS: The 'p' element's text is green, which means the style was correctly applied.", "violated-directive=style-src"];
 
         function alert_assert(msg) {
             t_alert.step(function() {
@@ -33,9 +38,6 @@
         }
 
     </script>
-    <!-- enforcing policy:
-style-src 'sha1-pfeR5wMA6np45oqDTP6Pj3tLpJo='; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
     <style>p { color: green; }</style>
     <style>p { color: red; }</style>
     <style>p { color: purple; }</style>
@@ -55,7 +57,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=style-src%20&apos;sha1-pfeR5wMA6np45oqDTP6Pj3tLpJo=&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-default-src.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-default-src.sub.html
similarity index 56%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-default-src.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-default-src.sub.html
index 159338c6db0e1..c7604b2972307 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-default-src.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-default-src.sub.html
@@ -2,8 +2,14 @@
 <html>
     <head>
     <title>stylehash allowed from default-src</title>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'sha256-SXMrww9+PS7ymkxYbv91id+HfXeO7p1uCY0xhNb4MIw='; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            test(function() { assert_unreached("securitypolicyviolat was fired")});
+        });
+    </script>
     </head>
 
     <body>
@@ -16,6 +22,5 @@
     </script>
 
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
     </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/stylenonce-allowed.sub.html
similarity index 74%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/stylenonce-allowed.sub.html
index 0cc14e7d8d573..c5ffdba6de475 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/stylenonce-allowed.sub.html
@@ -3,15 +3,20 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'self' 'nonce-noncynonce' 'nonce-noncy+/nonce='; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>stylenonce-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'self' nonce-noncynonce' 'nonce-noncy+/nonce='; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-    <script></script>
+    <script>
+        var t_spv = async_test("Should fire securitypolicyviolation");
+        window.addEventListener('securitypolicyviolation', t_spv.step_func_done(function(e) {
+            assert_equals(e.violatedDirective, "style-src");
+        }));
+      
+    </script>
+    
     <style nonce="noncynonce">
         #test1 {
             color: green;
@@ -48,7 +53,6 @@
     </script>
     <p>Style correctly whitelisted via a 'nonce-*' expression in 'style-src' should be applied to the page.</p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=style-src%20&apos;nonce-noncynonce&apos;%20&apos;nonce-noncy+/nonce=&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/style-src/stylenonce-blocked.sub.html
similarity index 65%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/stylenonce-blocked.sub.html
index 43204f64d3d3a..609e45abdc7bd 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylenonce-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/style-src/stylenonce-blocked.sub.html
@@ -3,16 +3,19 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="style-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>stylenonce-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="stylesheet" type="text/css" href="allowed.css">
+    <link rel="stylesheet" type="text/css" href="../style-src/resources/allowed.css">
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-style-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
--->
-    <script></script>
+    <script>
+        var t_spv = async_test("Should fire securitypolicyviolation");
+        window.addEventListener('securitypolicyviolation', t_spv.step_func_done(function(e) {
+            assert_equals(e.violatedDirective, "style-src");
+        }));      
+    </script>
     <style nonce="noncynonce">
         #test {
             color: red;
@@ -32,7 +35,6 @@
     </script>
     <p>Style that does not match a 'nonce-*' expression in 'style-src' should not be applied to the page.</p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=style-src%20&apos;self&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-style.js b/tests/wpt/web-platform-tests/content-security-policy/style-src/support/inject-style.js
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-style.js
rename to tests/wpt/web-platform-tests/content-security-policy/style-src/support/inject-style.js
diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js b/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js
index 803dc06d5ea63..ba179d6bab4eb 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js
@@ -36,6 +36,13 @@
   var reportLocation = location.protocol + "//" + location.host + "/content-security-policy/support/report.py?op=take&timeout=" + timeout + "&reportID=" + reportID;
 
   var reportTest = async_test("Violation report status OK.");
+
+  function assert_field_value(field, value, field_name) {
+    assert_true(field.indexOf(value.split(" ")[0]) != -1,
+                field_name + " value of  \"" + field + "\" did not match " +
+                value.split(" ")[0] + ".");
+  }
+
   reportTest.step(function () {
 
     var report = new XMLHttpRequest();
@@ -55,9 +62,11 @@
           // is reported, not the details...
 
           if(data["csp-report"] != undefined && data["csp-report"][reportField] != undefined) {
-            assert_true(data["csp-report"][reportField].indexOf(reportValue.split(" ")[0]) != -1,
-                reportField + " value of  \"" + data["csp-report"][reportField] + "\" did not match " +
-                reportValue.split(" ")[0] + ".");
+            assert_field_value(data["csp-report"][reportField], reportValue, reportField);
+          } else if (data[0] != undefined && data[0]["report"] != undefined && data[0]["report"][reportField] != undefined) {
+            assert_field_value(data[0]["report"][reportField], reportValue, reportField);
+          } else {
+            assert_equals("", reportField, "Expected report field could not be found in report");
           }
         }
 
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/document-write-alert-fail.js b/tests/wpt/web-platform-tests/content-security-policy/support/document-write-alert-fail.js
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/document-write-alert-fail.js
rename to tests/wpt/web-platform-tests/content-security-policy/support/document-write-alert-fail.js
diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/manifest.json b/tests/wpt/web-platform-tests/content-security-policy/support/manifest.json
new file mode 100644
index 0000000000000..97da19c5ca2c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/support/manifest.json
@@ -0,0 +1,5 @@
+{
+    "name": "Dummy manifest",
+    "start_url": "/start.html"
+}
+                                                                               
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/scripted.svg b/tests/wpt/web-platform-tests/content-security-policy/svg/scripted.svg
index a8aca4e30824b..5482831fa8596 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/svg/scripted.svg
+++ b/tests/wpt/web-platform-tests/content-security-policy/svg/scripted.svg
@@ -6,7 +6,7 @@
   <desc>Example script01 - redirect</desc>
 
   <script id="postmessagescript" type="application/ecmascript"> <![CDATA[
-    location = "/content-security-policy/blink-contrib/resources/postmessage-fail.html";
+    location = "/content-security-policy/support/postmessage-fail.html";
   ]]> </script>
 
   <circle cx="300" cy="225" r="100" fill="lawngreen"/>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/svg-from-guid.html b/tests/wpt/web-platform-tests/content-security-policy/svg/svg-from-guid.html
index b565e94a4e6cc..962cd88036368 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/svg/svg-from-guid.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/svg/svg-from-guid.html
@@ -31,7 +31,7 @@
   <desc>Example script01 - redirect</desc>
 
   <script id="postmessagescript" type="application/ecmascript"> <![CDATA[
-    location = "/content-security-policy/blink-contrib/resources/postmessage-fail.html";
+    location = "/content-security-policy/support/postmessage-fail.html";
   ]]> </script>
 
   <circle cx="300" cy="225" r="100" fill="lawngreen"/>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/svg-inline.sub.html b/tests/wpt/web-platform-tests/content-security-policy/svg/svg-inline.sub.html
index 7beb295f14b2c..3377f5dca6d92 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/svg/svg-inline.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/svg/svg-inline.sub.html
@@ -2,8 +2,16 @@
 <html>
 <head>
     <title>svg-policy-with-resource</title>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
+    <script>
+        var t_spv = async_test("Should fire violation event");
+        window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+            assert_equals(e.violatedDirective, "script-src");
+        }));        
+    </script>
+    
 </head>
 
 <body>
@@ -12,23 +20,22 @@
     not redirect to a different resource.</p>
     <div id="log"></div>
     <?xml version="1.0" standalone="no"?>
-<svg width="6cm" height="5cm" viewBox="0 0 600 500"
-     xmlns="http://www.w3.org/2000/svg" version="1.1">
+    
+    <svg width="6cm" height="5cm" viewBox="0 0 600 500"
+        xmlns="http://www.w3.org/2000/svg" version="1.1">
 
-    <script type="application/ecmascript"
+        <script type="application/ecmascript"
             xlink:href="http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/.js">
-    </script>
-
-  <circle cx="300" cy="225" r="100" fill="lawngreen"/>
+        </script>
 
-  <text x="300" y="250"
-        font-family="Verdana"
-        font-size="50"
-        text-anchor="middle">
-      PASS
-    </text>
-</svg>
+      <circle cx="300" cy="225" r="100" fill="lawngreen"/>
 
-    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27self%27+%27unsafe-inline%27'></script>
+      <text x="300" y="250"
+            font-family="Verdana"
+            font-size="50"
+            text-anchor="middle">
+          PASS
+      </text>
+    </svg>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/svg-inline.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/svg/svg-inline.sub.html.sub.headers
deleted file mode 100644
index a846c4b164759..0000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/svg/svg-inline.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: svg-inline={{$id:uuid()}}; Path=/content-security-policy/svg/
-Content-Security-Policy: script-src 'self' 'unsafe-inline'; report-uri  ../support/report.py?op=put&reportID={{$id}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-allowed.sub.html
similarity index 72%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-allowed.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-allowed.sub.html
index 88da806a89576..186996311b707 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-allowed.sub.html
@@ -2,28 +2,26 @@
 <html>
 
 <head>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';">
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
     <title>eval-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script src='../support/alertAssert.sub.js?alerts=["PASS (1 of 2)","PASS (2 of 2)"]'></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';
--->
 </head>
 
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+
         eval("alert_assert('PASS (1 of 2)')");
 
-    </script>
-    <script>
         window.eval("alert_assert('PASS (2 of 2)')");
-
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html
similarity index 62%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html
index 599b01c313818..998a616652a26 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked-and-sends-report.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html
@@ -3,18 +3,20 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>eval-blocked-and-sends-report</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS: eval() blocked."]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS: eval() blocked.","violated-directive=script-src"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'self'; report-uri resources/save-report.php?test=eval-blocked-and-sends-report.html; connect-src 'self';
--->
 </head>
 
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+
         try {
             eval("alert_assert('FAIL')");
         } catch (e) {
@@ -23,7 +25,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;self&apos;%20&apos;unsafe-inline&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.sub.html b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.sub.html
new file mode 100644
index 0000000000000..95b3d566ced45
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.sub.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self';">
+    <title>eval-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["violated-directive=script-src","PASS"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+
+<body>
+
+<p>Eval should be blocked in the iframe, but inline script should be allowed.</p>
+<script>
+    window.addEventListener('securitypolicyviolation', function(e) {
+        log("violated-directive=" + e.violatedDirective);
+    });
+    window.onmessage = function(e) {
+        log(e.data);    
+    }
+    window.onload = function() {
+        frames[0].document.write("<script>eval('window.parent.postMessage(\"FAIL\", \"*\");'); window.parent.postMessage(\"PASS\", \"*\");</sc" + "ript>");
+        frames[0].document.close();
+    }
+
+</script>
+<iframe src="about:blank"></iframe>
+
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked.sub.html
similarity index 69%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked.sub.html
index 229667e7d6643..7546082ee4126 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/eval-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked.sub.html
@@ -3,26 +3,26 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>eval-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS EvalError","PASS EvalError"]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS EvalError","PASS EvalError", "violated-directive=script-src"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+
         try {
             eval("alert_assert('FAIL (1 of 2)')");
         } catch (e) {
             log("PASS EvalError");
         }
 
-    </script>
-    <script>
         try {
             window.eval("alert_assert('FAIL (1 of 2)')");
         } catch (e) {
@@ -31,7 +31,6 @@
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;unsafe-inline&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html
new file mode 100644
index 0000000000000..ee888eaa4957d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';">
+    <title>eval-scripts-setInterval-allowed</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS 1 of 2","PASS 2 of 2"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+<pre>
+<script>
+  window.addEventListener('securitypolicyviolation', function(e) {
+    log("Fail");
+  });
+  
+  var id_string = setInterval("clearInterval(id_string); log('PASS 1 of 2')", 0);
+  if (id_string == 0)
+    log('FAIL: Return value for string (should not be 0): ' + id_string);
+  
+  var id_function = setInterval(function() {
+    clearInterval(id_function);
+    log('PASS 2 of 2');
+  }, 0);
+  
+  if (id_function == 0)
+    log('FAIL');
+</script>
+</pre>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html
new file mode 100644
index 0000000000000..0d65e294f7518
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self';">
+    <title>eval-scripts-setInterval-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS","violated-directive=script-src"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+<script>
+  window.addEventListener('securitypolicyviolation', function(e) {
+    log("violated-directive=" + e.violatedDirective);
+  });
+  
+  var id = setInterval("alert_assert('FAIL')", 0);
+  if (id != 0)
+    log('FAIL: Return value for string (should be 0): ' + id);
+  
+  var id = setInterval(function() {
+    clearInterval(id);
+    log('PASS');
+  }, 0);
+  
+  if (id == 0)
+    log('FAIL');
+</script>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html
new file mode 100644
index 0000000000000..ff85a867489b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';">
+    <title>eval-scripts-setTimeout-allowed</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS 1 of 2","PASS 2 of 2"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+<script>
+  window.addEventListener('securitypolicyviolation', function(e) {
+    log("Fail");
+  });
+  
+  var id = setTimeout("log('PASS 1 of 2')", 0);
+  if (id == 0)
+    log('FAIL');
+  var id = setTimeout(function() {
+    log('PASS 2 of 2');
+  }, 0);
+  if (id == 0)
+    log('FAIL');
+</script>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html
new file mode 100644
index 0000000000000..21737ce8cb226
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self';">
+    <title>eval-scripts-setTimeout-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS","violated-directive=script-src"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+<script>
+  window.addEventListener('securitypolicyviolation', function(e) {
+    log("violated-directive=" + e.violatedDirective);
+  });
+  
+  var id = setTimeout("alert_assert('FAIL')", 0);
+  if (id != 0)
+    log('FAIL');
+    
+  var id = setTimeout(function() {
+    log('PASS');
+  }, 0);
+  
+  if (id == 0)
+    log('FAIL');
+</script>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-allowed.sub.html
new file mode 100644
index 0000000000000..8e6661b21c60c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-allowed.sub.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self';">
+    <title>function-constructor-allowed</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS"]'></script>
+    <script src='../support/alertAssert.sub.js?alerts=[]'></script>
+</head>
+
+<body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+
+        (new Function("log('PASS')"))();
+
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html
similarity index 63%
rename from tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-blocked.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html
index be0c574776edd..eb610ff542f87 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/function-constructor-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html
@@ -3,27 +3,28 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self';">
     <title>function-constructor-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS EvalError"]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS EvalError","violated-directive=script-src"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-    <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
--->
 </head>
 
 <body>
     <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+        
         try {
-            (new Function("alert_assert('FAIL')"))();
+            (new Function("log('FAIL')"))();
         } catch (e) {
             log("PASS EvalError");
         }
 
     </script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20&apos;unsafe-inline&apos;"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox-1/percentage-heights-000.html b/tests/wpt/web-platform-tests/css/css-flexbox-1/percentage-heights-000.html
index 136ef2b12ce47..c23a43911cf18 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox-1/percentage-heights-000.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox-1/percentage-heights-000.html
@@ -34,7 +34,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.flexbox')">
 <div id=log></div>
 
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox-1/percentage-heights-001.html b/tests/wpt/web-platform-tests/css/css-flexbox-1/percentage-heights-001.html
index f24eee9eccf20..6550206b7e866 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox-1/percentage-heights-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox-1/percentage-heights-001.html
@@ -9,7 +9,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <style>
 .rect {
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-001.html b/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-001.html
index d3d808940e526..2e65533aeb399 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-001.html
@@ -80,7 +80,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.flexbox')">
 <div id=log></div>
 <script>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-002.html b/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-002.html
index bf69765323e43..9c1cc42792093 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-002.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-002.html
@@ -67,7 +67,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.flexbox')">
 <div id=log></div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-003.html b/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-003.html
index 025aef6f45a8a..94763c8ebf185 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-003.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-003.html
@@ -25,7 +25,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.rect')">
 <div id=log></div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-004.html b/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-004.html
index ff14f35b1463d..aa8ee516d403b 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-004.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox-1/position-absolute-004.html
@@ -25,7 +25,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <script>
 function update() {
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-01.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-01.html
new file mode 100644
index 0000000000000..4d7dcd8d577da
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-01.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property initial value is normal</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="The ‘font-stretch’ property selects a normal, condensed, or expanded face from a font family.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: ultra-expanded;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: normal;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-02.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-02.html
new file mode 100644
index 0000000000000..e07394db5d091
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-02.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property ultra-expanded</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="The ‘font-stretch’ property selects a normal, condensed, or expanded face from a font family.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: ultra-expanded;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: ultra-expanded;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-03.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-03.html
new file mode 100644
index 0000000000000..75cddfedc34b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-03.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property extra-expanded</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="The ‘font-stretch’ property selects a normal, condensed, or expanded face from a font family.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: extra-expanded;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: extra-expanded;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-04.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-04.html
new file mode 100644
index 0000000000000..85d7c20ee368f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-04.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, expanded</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="The ‘font-stretch’ property selects a normal, condensed, or expanded face from a font family.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: expanded;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: expanded;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-05.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-05.html
new file mode 100644
index 0000000000000..2bb45288e1bd9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-05.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, semi-expanded</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="The ‘font-stretch’ property selects a normal, condensed, or expanded face from a font family.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: semi-expanded;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: semi-expanded;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-06.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-06.html
new file mode 100644
index 0000000000000..6118d3f79f26a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-06.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, normal</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="The ‘font-stretch’ property selects a normal, condensed, or expanded face from a font family.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: semi-expanded;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: normal;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: normal;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-07.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-07.html
new file mode 100644
index 0000000000000..c94ddfa2f60cd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-07.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, semi-condensed</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="The ‘font-stretch’ property selects a normal, condensed, or expanded face from a font family.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: semi-condensed;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: semi-condensed;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-08.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-08.html
new file mode 100644
index 0000000000000..e9da4465babb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-08.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, condensed</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc">
+<meta name="assert" content="The ‘font-stretch’ property selects a normal, condensed, or expanded face from a font family.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: condensed;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: condensed;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-09.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-09.html
new file mode 100644
index 0000000000000..0fcd04ea54b8b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-09.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, extra-condensed</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc">
+<meta name="assert" content="The ‘font-stretch’ property selects a normal, condensed, or expanded face from a font family.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: extra-condensed;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: extra-condensed;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-10.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-10.html
new file mode 100644
index 0000000000000..55a3fa5e00727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-10.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, ultra-condensed</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc">
+<meta name="assert" content="The ‘font-stretch’ property selects a normal, condensed, or expanded face from a font family.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: ultra-condensed;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: ultra-condensed;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-11.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-11.html
new file mode 100644
index 0000000000000..151a436c62e9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-11.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, mapping values</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="When a face does not exist for a given width, normal or condensed values map to a narrower face, otherwise a wider face.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: condensed;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: ultra-condensed;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-12.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-12.html
new file mode 100644
index 0000000000000..f3d0532b5e5e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-12.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, mapping values</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="When a face does not exist for a given width, normal or condensed values map to a narrower face, otherwise a wider face.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: condensed;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: semi-condensed;
+			}
+
+</style>
+<!-- per Fig 17,  where the narrower face is used 'otherwise'
+	for semi condensed, before the normal face gets examined -->
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-13.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-13.html
new file mode 100644
index 0000000000000..c4e169477d5f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-13.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, mapping values</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="When a face does not exist for a given width, normal or condensed values map to a narrower face, otherwise a wider face.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: normal;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: condensed;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: expanded;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-14.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-14.html
new file mode 100644
index 0000000000000..51736a1fb76dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-14.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, mapping values</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="When a face does not exist for a given width, normal or condensed values map to a narrower face, otherwise a wider face.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: expanded;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: normal;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: semi-expanded;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-15.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-15.html
new file mode 100644
index 0000000000000..8607ac9cee836
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-15.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, mapping values</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="When a face does not exist for a given width, normal or condensed values map to a narrower face, otherwise a wider face.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: expanded;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: condensed;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: semi-expanded;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-16.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-16.html
new file mode 100644
index 0000000000000..70f81f001f8f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-16.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, mapping values</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="When a face does not exist for a given width, normal or condensed values map to a narrower face, otherwise a wider face.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: condensed;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: expanded;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: normal;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-17.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-17.html
new file mode 100644
index 0000000000000..3938ced749a4f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-17.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, mapping values</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="When a face does not exist for a given width, normal or condensed values map to a narrower face, otherwise a wider face.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: condensed;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: expanded;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: semi-condensed;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-18.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-18.html
new file mode 100644
index 0000000000000..496c16d198df1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-18.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-stretch property, mapping values</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-stretch-pass-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-stretch-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-prop-desc>"
+<meta name="assert" content="When a face does not exist for a given width, normal or condensed values map to a narrower face, otherwise a wider face.">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: extra-condensed;
+			}
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/fail.woff) format("woff");
+                font-stretch: expanded;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+                font-stretch: condensed;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-pass-ref.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-pass-ref.html
new file mode 100644
index 0000000000000..0bd11557a61fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-stretch-pass-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  pass reference</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/pass.woff) format("woff");
+                font-stretch: normal;
+			}
+    .test {
+				font-family: "test";
+				font-size: 6em;
+			}
+
+</style>
+
+<p>Test passes if the word PASS appears below.</p>
+<section class="test">
+    <p>P</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-01-ref.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-01-ref.html
new file mode 100644
index 0000000000000..535518272a04c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-01-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-synthesis: none disables fake bold</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/Lato-Medium.ttf);
+			}
+    .test {
+				font-family: "test";
+				font-size: 3em;
+			}
+</style>
+
+<p>Test passes if the two lines below are identical (the second line is <em>not bold</em>), and there is no red.</p>
+<section class="test">
+    <p>Filler text</p>
+    <p class="nosynth">Filler text</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-01.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-01.html
new file mode 100644
index 0000000000000..cf6d099e0ddc3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-01.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-synthesis: none disables fake bold</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-synthesis-01-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-synthesis-prop">
+<meta name="assert" content=" If ‘weight’ is not specified, user agents must not synthesize bold faces">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/Lato-Medium.ttf);
+			}
+    @supports not (font-synthesis: none) {
+        .test {color: red;}
+    }
+    .test {
+				font-family: "test";
+				font-size: 3em;
+			}
+    .nosynth {
+        font-weight: bold;
+        font-synthesis: none;
+    }
+</style>
+
+<p>Test passes if the two lines below are identical (the second line is <em>not bold</em>), and there is no red.</p>
+<section class="test">
+    <p>Filler text</p>
+    <p class="nosynth">Filler text</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-02-ref.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-02-ref.html
new file mode 100644
index 0000000000000..5f80bcdf5a56e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-02-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-synthesis: style disables fake bold</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/Lato-Medium.ttf);
+			}
+    .test {
+				font-family: "test";
+				font-size: 3em;
+			}
+</style>
+
+<p>Test passes if the two lines below are identical (the second line is <em>not bold</em>), and there is no red.</p>
+<section class="test">
+    <p>Filler text</p>
+    <p class="nosynth">Filler text</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-02.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-02.html
new file mode 100644
index 0000000000000..59243c4cb7a8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-02.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-synthesis: style disables fake bold</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-synthesis-02-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-synthesis-prop">
+<meta name="assert" content=" If ‘weight’ is not specified, user agents must not synthesize bold faces">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/Lato-Medium.ttf);
+			}
+    @supports not (font-synthesis: style) {
+        .test {color: red;}
+    }
+    .test {
+				font-family: "test";
+				font-size: 3em;
+			}
+    .nosynth {
+        font-weight: bold;
+        font-synthesis: style;
+    }
+</style>
+
+<p>Test passes if the two lines below are identical (the second line is <em>not bold</em>), and there is no red.</p>
+<section class="test">
+    <p>Filler text</p>
+    <p class="nosynth">Filler text</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-03-ref.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-03-ref.html
new file mode 100644
index 0000000000000..8f36b311177a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-03-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-synthesis: none disables fake italic/oblique</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/Lato-Medium.ttf);
+			}
+    .test {
+				font-family: "test";
+				font-size: 3em;
+			}
+</style>
+
+<p>Test passes if the two lines below are identical (the second line is <em>not obliqued</em>), and there is no red.</p>
+<section class="test">
+    <p>Filler text</p>
+    <p class="nosynth">Filler text</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-03.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-03.html
new file mode 100644
index 0000000000000..53cac8ee4019b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-03.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-synthesis: none disables fake italic/oblique</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-synthesis-03-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-synthesis-prop">
+<meta name="assert" content="if ‘style’ is not specified user agents must not synthesize italic faces">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/Lato-Medium.ttf);
+			}
+    @supports not (font-synthesis: none) {
+        .test {color: red;}
+    }
+    .test {
+				font-family: "test";
+				font-size: 3em;
+			}
+    .nosynth {
+        font-style: italic;
+        font-synthesis: none;
+    }
+</style>
+
+<p>Test passes if the two lines below are identical (the second line is <em>not obliqued</em>), and there is no red.</p>
+<section class="test">
+    <p>Filler text</p>
+    <p class="nosynth">Filler text</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-04-ref.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-04-ref.html
new file mode 100644
index 0000000000000..f3b65481f226c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-04-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-synthesis: bold disables fake italic/oblique</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/Lato-Medium.ttf);
+			}
+    .test {
+				font-family: "test";
+				font-size: 3em;
+			}
+</style>
+
+<p>Test passes if the two lines below are identical (the second line is <em>not obliqued</em>), and there is no red.</p>
+<section class="test">
+    <p>Filler text</p>
+    <p class="nosynth">Filler text</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-04.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-04.html
new file mode 100644
index 0000000000000..9081715469278
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-04.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-synthesis: bold disables fake italic/oblique</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-synthesis-04-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-synthesis-prop">
+<meta name="assert" content="if ‘style’ is not specified user agents must not synthesize italic faces">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/Lato-Medium.ttf);
+			}
+    @supports not (font-synthesis: weight) {
+        .test {color: red;}
+    }
+    .test {
+				font-family: "test";
+				font-size: 3em;
+			}
+    .nosynth {
+        font-style: italic;
+        font-synthesis: weight;
+    }
+</style>
+
+<p>Test passes if the two lines below are identical (the second line is <em>not obliqued</em>), and there is no red.</p>
+<section class="test">
+    <p>Filler text</p>
+    <p class="nosynth">Filler text</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-05-ref.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-05-ref.html
new file mode 100644
index 0000000000000..801889d156055
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-05-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-synthesis: initial value</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/Lato-Medium.ttf);
+			}
+    .test {
+				font-family: "test";
+				font-size: 3em;
+                font-synthesis: weight style;
+                color: green;
+			}
+</style>
+
+<p>Test passes if the text below is green, not red.</p>
+<section class="test">
+    <p>Filler text</p>
+    <!-- Synthesis is allowed, but not required -->
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-05.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-05.html
new file mode 100644
index 0000000000000..bdbc22f9cfcb3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-synthesis-05.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-synthesis: initial value</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="match" href="font-synthesis-03-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-synthesis-prop">
+<meta name="assert" content="This property controls whether user agents are allowed to synthesize bold or oblique font faces">
+<style>
+    @font-face {
+				font-family: "test";
+				src: url(support/fonts/Lato-Medium.ttf);
+			}
+    @supports not (font-synthesis: weight style) {
+        .test p {color: red;}
+    }
+    .test {
+				font-family: "test";
+				font-size: 3em;
+                font-synthesis: weight style;
+                color: green;
+			}
+</style>
+
+<p>Test passes if the text below is green, not red.</p>
+<section class="test">
+    <p>Filler text</p>
+    <!-- Synthesis is allowed, but not required -->
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-variant-position-02.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-variant-position-02.html
index 9301023ccfc7c..842c726dbff4e 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts-3/font-variant-position-02.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-variant-position-02.html
@@ -5,7 +5,6 @@
 <link rel="author" title="Chris Lilley" href="chris@w3.org">
 <link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-position-prop">
 <link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
-<link rel="match" href="font-variant-position-02-ref.html">
 <meta name="assert" content="Enables display of subscript variants (OpenType feature: subs).">
 <style>
   @font-face {
@@ -23,18 +22,13 @@
   .low {
 	font-feature-settings: "subs" on, "sups" off;
   }
-.foo {
-  color: #100;
-}
-.bar {
-  color: #001;
-}
 </style>
 <body>
-<p>Test passes if the three lines below are identical, with one checkmark (✓) followed by one cross (✗)</p>
-<!-- Identical? If the UA is allowed to simulate subscripts and superscripts then the first line will use smaller glyphs than the second and third. Maybe "similar" and point out size doesn't matter on this test?  -->
+<p>Test passes if the second and third lines below are identical, with two checkmarks (✓) followed by one cross (✗); and
+  also, if the first line is <em>either</em> identical to the other two, <em>or</em> has one checkmark followed by two <b>subscript</b> crosses.
+  If the first line has a checkmark followed by two normally sized crosses, the test fails.  </p>
 <section class="test">
-  <p class="high"><span class="foo">H</span><span class="bar">I</span></p>
-  <p class="high"><span class="foo">H</span><span class="bar">I</span></p>
-	<p class="ref">AB</p>
+  <p>A<span class="high">HI</span></p>
+  <p>A<span class="low">HI</span></p>
+	<p class="ref">AAB</p>
 </section>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/font-variant-position-03.html b/tests/wpt/web-platform-tests/css/css-fonts-3/font-variant-position-03.html
index 02ea0875e747a..f0fc871f05b25 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts-3/font-variant-position-03.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/font-variant-position-03.html
@@ -5,7 +5,6 @@
 <link rel="author" title="Chris Lilley" href="chris@w3.org">
 <link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-position-prop">
 <link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
-<link rel="match" href="font-variant-position-03-ref.html">
 <meta name="assert" content="Enables display of subscript variants (OpenType feature: subs).">
 <style>
   @font-face {
@@ -23,19 +22,14 @@
   .low {
 	font-feature-settings: "subs" off, "sups" on;
   }
-.foo {
-  color: #100;
-}
-.bar {
-  color: #001;
-}
 </style>
 <body>
-<p>Test passes if the three lines below are identical, with one cross (✗) followed by one checkmark (✓)  </p>
-<!-- Identical? If the UA is allowed to simulate subscripts and superscripts then the first line will use smaller glyphs than the second and third. Maybe "similar" and point out size doesn't matter on this test?  -->
+<p>Test passes if the second and third lines below are identical, with two crosses (✗) followed by one checkmark (✓); and
+  also, if the first line is <em>either</em> identical to the other two, <em>or</em> has one  cross followed by two <b>superscript</b> crosses.
+  If the first line has three normally sized crosses, the test fails.</p>
 
 <section class="test">
-  <p class="high"><span class="foo">H</span><span class="bar">I</span></p>
-  <p class="high"><span class="foo">H</span><span class="bar">I</span></p>
-	<p class="ref">BA</p>
+  <p>B<span class="high">HI</span></p>
+  <p>B<span class="low">HI</span></p>
+	<p class="ref">BBA</p>
 </section>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo-DemiBold.otf b/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo-DemiBold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..b83a13a43f77e56849379998f8535f00fc5f0723
GIT binary patch
literal 110564
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
Kvn&f)&HoRBiUZ{U

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo2-SemiBold.otf b/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo2-SemiBold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..76b49cdc3341560a051efed20e4475570c39b997
GIT binary patch
literal 123976
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
S#86gZ+3d;*{3`KjrT!0E)2Chl

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo2-SemiBoldCondensed.otf b/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo2-SemiBoldCondensed.otf
new file mode 100644
index 0000000000000000000000000000000000000000..832e1b44f7f4b5ce6d635913092f307550a53993
GIT binary patch
literal 67940
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

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo2-SemiBoldExpanded.otf b/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/Exo2-SemiBoldExpanded.otf
new file mode 100644
index 0000000000000000000000000000000000000000..f764e132a460529efdd5458d95bcbb9da2b21e0f
GIT binary patch
literal 68772
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
P?zVwtYxniu?kD~S3vvT}

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/fail.woff b/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/fail.woff
new file mode 100644
index 0000000000000000000000000000000000000000..33487cdbb4f2a88b2107c191cce051cb5a247e1f
GIT binary patch
literal 2136
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
QVJJKl4qgWImLR>rKPgd^TL1t6

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/pass.woff b/tests/wpt/web-platform-tests/css/css-fonts-3/support/fonts/pass.woff
new file mode 100644
index 0000000000000000000000000000000000000000..839bb20b12fee0e6f24f76ea58501aff76fa5a14
GIT binary patch
literal 2112
zcmZuyXH-*J7kvQ<K_dc!f>NT42!sx1C;}OQXe1;^VhKgkAhZN#u*8CtP(C_=87To&
zkP;z+fC(dxGzF2NN>NY{8(@IJp{P;Jyv&-P-&t?pd(S>+t^Mv=Z=ZLbfWZI|01Ox!
z*dpIm5%Tr_1%YU30{{>XSaSnG$rP~TPPluW0=Yi{K;abtD7|6}&oSsMY7_u$ss($F
zfHfZlKd3V^;zBT32Pp+`QK-i2o+gF_Q5j$z29hW_6st3gLO>Ga&|r=L@q@O(cC!%H
z8Bh~)AI#O{uzCt9iio6xeVbOne6t)75`bn=IiN0t0_NHv5a50K*;G~#04ReR5JOOx
zg*Iu}85J3Q2E4Bs*t1>UCkq9F0SI^kQB?BcT;R5YYrq!yYXQLH&-WeWd(WOE63{1G
zP%l%u4W=r9f}8~aPBERrpilxn$+jwTy<IxV$+ijU+Hrf0<CK8(XG*{PSEo?zd)vAI
zg$#HI0BCsv6LS8&HMO{{?MYjQWBO=8eEc!}L$-m8BXk;CG2^jr>$m$Ps4`S389*h+
zqFp48Q1yacJD@1FincZYxMKn{0HC1092${8p9TZy;}q)+5xM$MO<<_Uvk{9Du_pg}
zo{zA6CPn-acG}|jd`ZfRGW3YYEtz4V6ILa+8OcLz6&x_f7FpnoGAs8BgJHJ0cw1g=
zA-0a(QOg*NV2mtKRc%7?HsKZxAxl=<$OkN++XWU}Tkwt3_01{vH8#Upm>*)B@7iIQ
zy<>mfRhVZk!IKy0NksQ12ANd9Grsw*bF=1Hn&!|^&Cw@Rt+deNY2kP49rras_uVzB
zXgYC<KkS=g<NIUnVX~0mz(QYOX`{*#P?cpU6}}Iae~ipeF|RH&7u*t7R|-2(q;b*6
z;5q80urTGY(8FQjRrR)Ko3@<28~!Zw;zWsbf(xCnUGQ*Q^fFxBzFu)>y*zcjN}vi;
z9>ysT`75Wmh1_rp6?AsYG!3gajq#eW-+HT~>{w^vi)SM2v(_C;RUPBA9IcDp_m|+9
zB^vmObbNUYzKY)uV-5!}huoMc(Q|_6`HGb};Yz2{>QK_^sK*RVI<Fy>_(10xq8t>@
zDsj&QHK(=TE826<$iLS+pxY{7AnK(Wn~}(--DInZt&WOqe8tunaf*|6jgwAQOUKKM
zacA7%AGnd2nJY%~5F<(ZvKn#Kins=Qx*EdCn7>%8b8+v%9-Q+dGiSY0s;D$5tCW7b
zbep9W!O|wsGAW;Y{p6|YljNJ@9WCVAadO$G#7_;RzvzWi1HZ%|F6U@T)sSm5%jzfQ
zx1NxAjm?$M&}&D#$yJ0zLc{56G_H%DOD87gs+UxkzxHKWN%VschbNT!e72cf)e=c+
z76!*V#-9r!>piF8(=_peKK+=KKcwu>`d?RL)+Nd_DY}E%_SFW_M_g50-_>8~Qr|fE
zEumbxuX`1lB@r&8_OFKHKm0f&E*}2NUO1iN8ik2{Tl@W?!-m7Rq!lT0=c;)5yu}9t
z|6wQpG1t!4=Cau6<1!UubLEw%o5r`B$RLkYdb;GEp-_V3C^}FKRBajZw|4vG9Z*F?
zA0!cn_Kk1P-1ABnyGbJJlwJBBnfyUP5rcvz#PRAi5R`<*f>a+@aEc7VwiJSvkp~)_
z8UOk>2=peR`G043C^~TwTzjq^S67j{*HG;ivccAL^PxS4#SFXP;KJ_aB$KS4dtLEW
zu`27WyU1`EoBC}%TXM~A0NPcBQ*DiuWl}Cn3DRu?;;=Dt>+pli)RMKx&el4a==&S+
z_*L3^CC50=<V_G1ib`&jO~d*r0o{m>>z&?R-UEXVqmscPFnEeIG;+%OIcexf7M7Hl
zjV<Jnc_m(1J=$heMsR<~pD>!uW>bkZ68RCL)nlF7Yt0=sorhTOZfUrFN4N0~PcKi9
zs-JgHzfq8?muEeAFek^MJhjNiJD#UgzSs77vely!Sqo*{qOy8;@jzDAfk{uY(t8;(
zRgF5jegL)cH4Ax<nECPgrtQqx>8G`RZ-1{XI~uS^d^y5+iKP4HyCdySS`a?=!=t=&
zkJ0n;XV)y|*2JElMsm*8Va<y3t}l{A##2W9o$fiFarxPAT9$qlAWz^*I_$Y09|znv
zv3mMql;P~{MZDTYo#^23Ios$zv9GwC##g>>4S)NNOn=L2sKU78dPHAZl0QE7TR{^|
zE_^94ySmYOE52bv1}~re%~4?Q&L_JoaRlVI?|-v*$M=cU^R>oFG+Ouza`250S82>V
z?bkIouKnt_s54R;VrsOntIN_*YDw#!YNcJ0v8bkurpkv1C=?2q=C<&_kAYJhlhcmx
zK&vIok`g$B>2p6>M%#43*beJqW`{L~y$MD+5k=62T-K%aJ@C34gjX#NLbr_FXZWIN
z*Nxe0OA7XnoHUCnqJ~}gqwVT7kxQ@j-DZGUj@r`CYuM&&+lWNv<~HPc!K(sf{xg;H
zoUxRsodcgWRikQdCthkkmfaEKU$b)tvNYo7m`*>6BOl9s7@arDukh?M6?q)5922hW
z<vaRCmIq=qn07-qTs{X;{R<}(npC@e!zXs{Hkiar8RwEmRNc~aXb)g2@S`O2eg1`w
z{oX6>W;4&2^{;Pvw3p`IefMFPg9J_t?wv9(i`D4q&9I8cJpMH8Y*@!^e{#n#QkK{(
u#%hZr`z8o4X7%tZ=RKw#%rTjPG=qr6f4ve6aAl$JP&oM0H(7)X0RI5chnp4v

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/test_font_family_parsing.html b/tests/wpt/web-platform-tests/css/css-fonts-3/test_font_family_parsing.html
index fc7008d4350b4..d56a7f712d985 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts-3/test_font_family_parsing.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/test_font_family_parsing.html
@@ -133,21 +133,18 @@
   { namelist: "normal simple", single: true },
   { namelist: "caption", single: true }, // these are keywords for the 'font' property but only when in the first position
   { namelist: "icon", single: true },
-  { namelist: "menu", single: true }
-
+  { namelist: "menu", single: true },
+
+  /* Unset */
+  { namelist: "unset", invalid: true, fontonly: true, single: true },
+  { namelist: "unset, simple", invalid: true },
+  { namelist: "simple, unset", invalid: true },
+  { namelist: "simple, unset bongo" },
+  { namelist: "simple, bongo unset" },
+  { namelist: "simple unset", single: true },
+  { namelist: "unset simple", single: true },
 ];
 
-if (SpecialPowers.getBoolPref("layout.css.unset-value.enabled")) {
-  testFontFamilyLists.push(
-    { namelist: "unset", invalid: true, fontonly: true, single: true },
-    { namelist: "unset, simple", invalid: true },
-    { namelist: "simple, unset", invalid: true },
-    { namelist: "simple, unset bongo" },
-    { namelist: "simple, bongo unset" },
-    { namelist: "simple unset", single: true },
-    { namelist: "unset simple", single: true });
-}
-
 var gTest = 0;
 
 /* strip out just values */
diff --git a/tests/wpt/web-platform-tests/css/css-fonts-3/test_font_feature_values_parsing.html b/tests/wpt/web-platform-tests/css/css-fonts-3/test_font_feature_values_parsing.html
index c67e754cd6009..f5c03c1604a79 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts-3/test_font_feature_values_parsing.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts-3/test_font_feature_values_parsing.html
@@ -69,7 +69,6 @@
   { rule: makeRule("bongo", "@styleset { abc 1 2 3 }"), serializationNoValueDefn: true },
   { rule: makeRule("bongo", "@styleset { abc:, 1 2 3 }"), serializationNoValueDefn: true },
   { rule: makeRule("bongo", "@styleset { abc:; 1 2 3 }"), serializationNoValueDefn: true },
-  { rule: makeRule("bongo", "@styleset { abc:; 1 2 3 }"), serializationNoValueDefn: true },
   { rule: makeRule("bongo", "@styleset { abc: 1 2 3a }"), serializationNoValueDefn: true },
   { rule: makeRule("bongo", "@styleset { abc: 1 2 3, def: 1; }"), serializationNoValueDefn: true },
   { rule: makeRule("bongo", "@blah @styleset { abc: 1 2 3; }"), serializationNoValueDefn: true },
@@ -335,10 +334,6 @@
 }
 
 function testFontFeatureValuesRuleParsing() {
-  // Gecko-specific check - if pref not set, skip these tests
-  if (window.SpecialPowers && !window.SpecialPowers.getBoolPref("layout.css.font-features.enabled")) {
-    return;
-  }
   var i;
   for (i = 0; i < testrules.length; i++) {
     var testrule = testrules[i];
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-definite-sizes-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-definite-sizes-001.html
index 1249a14263867..e522fc4880272 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-definite-sizes-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-definite-sizes-001.html
@@ -33,7 +33,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-grid-container-containing-block-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-grid-container-containing-block-001.html
index 65a358e10a604..cf9407e6392f7 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-grid-container-containing-block-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-grid-container-containing-block-001.html
@@ -112,7 +112,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 
 <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-grid-container-parent-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-grid-container-parent-001.html
index 3ea36c7dab941..15ed632860abe 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-grid-container-parent-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/absolute-positioning-grid-container-parent-001.html
@@ -34,7 +34,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.container')">
 
 <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-content-alignment-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-content-alignment-001.html
index d92c9b7c09125..737efcb649747 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-content-alignment-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-content-alignment-001.html
@@ -34,7 +34,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-content-alignment-rtl-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-content-alignment-rtl-001.html
index 748cb6f40b4bc..e0aa177e0d870 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-content-alignment-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-content-alignment-rtl-001.html
@@ -34,7 +34,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-gaps-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-gaps-001.html
index 5869bfbea4f93..41d3ffba27a0e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-gaps-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-gaps-001.html
@@ -36,7 +36,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-gaps-rtl-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-gaps-rtl-001.html
index e6fe7c2736198..17a2b3df9709e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-gaps-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-gaps-rtl-001.html
@@ -36,7 +36,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-implicit-grid-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-implicit-grid-001.html
index 063da56fe5599..882ebdca30777 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-implicit-grid-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-implicit-grid-001.html
@@ -30,7 +30,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-implicit-grid-line-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-implicit-grid-line-001.html
index 908ea39ef5d17..35199838744d6 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-implicit-grid-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-implicit-grid-line-001.html
@@ -51,7 +51,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-padding-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-padding-001.html
index 5a7244c78a1f4..2ba5cd23e04f9 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-padding-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-padding-001.html
@@ -38,7 +38,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-unknown-named-grid-line-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-unknown-named-grid-line-001.html
index 6aee082f674a0..5cde2ec862ac9 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-unknown-named-grid-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-unknown-named-grid-line-001.html
@@ -44,7 +44,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-within-grid-implicit-track-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-within-grid-implicit-track-001.html
index 1c82feb04f737..078d51b29c593 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-within-grid-implicit-track-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-positioned-items-within-grid-implicit-track-001.html
@@ -40,7 +40,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-sizing-positioned-items-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-sizing-positioned-items-001.html
index 4bd43cc9b232c..390630c194563 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-sizing-positioned-items-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/grid-sizing-positioned-items-001.html
@@ -55,7 +55,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html
index 25881a48e50b8..f9935831b65e4 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html
@@ -29,7 +29,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/positioned-grid-items-should-not-take-up-space-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/positioned-grid-items-should-not-take-up-space-001.html
index c7983671cc907..75ef482fcfb16 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/abspos/positioned-grid-items-should-not-take-up-space-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/abspos/positioned-grid-items-should-not-take-up-space-001.html
@@ -33,7 +33,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onload="checkLayout('.grid')">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-001.html
index 71e1ee8425df8..f8da0b8c5289b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-001.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-002.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-002.html
index 01f48ccde75f1..d04de07cb5594 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-002.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-003.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-003.html
index d3c5ae10614d9..99bc2f87f98e7 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-003.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-004.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-004.html
index 1f5ca8d19b4ff..da38a8589e8eb 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-004.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-005.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-005.html
index 07b0aca737619..c91f470a99fc9 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-005.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-005.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-006.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-006.html
index f0f4d5d4353a8..7d6e3bbdb234e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-006.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-006.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-007.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-007.html
index 5dd70bd1f61dc..4bd585b8aac9a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-007.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-007.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-008.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-008.html
index f1b22c563530f..613f6385fde9c 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-008.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-008.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-009.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-009.html
index fb0041ce71f64..fd0bc524db8fb 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-009.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-009.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-010.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-010.html
index 1e68845baaadb..e776bb1dbe45e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-010.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-010.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-011.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-011.html
index e38852090ceda..c5bbd89412407 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-011.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-011.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-012.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-012.html
index 3ab4977a4d919..767049a2ef8fc 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-012.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-012.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-013.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-013.html
index bd6ce3f94dd65..0930bdccbec85 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-013.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-013.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-014.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-014.html
index ab565666b5ce7..fbc529ad62d3f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-014.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-014.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-015.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-015.html
index 844713a7285f7..40869f8ae803c 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-015.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-015.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-016.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-016.html
index dd3b4bee1dddb..e003509618fac 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-016.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-016.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-017.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-017.html
index 5b2c20e83399f..74da9fe7497b7 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-017.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-017.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-018.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-018.html
index 77711aaad3861..05c579ac818d9 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-018.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-018.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-019.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-019.html
index 9d0bbc936bac1..ee9b581a7db9f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-019.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-019.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-020.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-020.html
index 86dc27130d173..e42a46b129683 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-020.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-020.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-021.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-021.html
index 1c92223bff6a5..d4cb7259daa71 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-021.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-021.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-022.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-022.html
index 94a634b9ad412..6d8c204d1a564 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-022.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-022.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-023.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-023.html
index 3476f12200cee..4bb3796abc8ee 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-023.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-023.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-024.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-024.html
index 92db002454315..8aaef60f87e07 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-024.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-024.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-025.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-025.html
index 997fa855415d6..0ef21c9afe5ae 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-025.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-025.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-026.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-026.html
index 9d18be6f264d3..56c7e3f07d942 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-026.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-026.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-027.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-027.html
index 78b9fbd72d67b..8f8797ee00b04 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-027.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-027.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-028.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-028.html
index 1426cc41b0674..38021f95300fe 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-028.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-028.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-029.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-029.html
index ca9f47a5846e9..cfdf51d804c65 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-029.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-029.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-030.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-030.html
index 103b04d76fafa..1fb01728e0f01 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-030.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-030.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-031.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-031.html
index 9c85e5a903506..9cdaabbfdd76b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-031.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-031.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-032.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-032.html
index 093c0f966e026..c4941dd6f1b1b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-032.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-032.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-033.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-033.html
index 1cf535803bb70..fb89cc1c3bb0e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-033.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-033.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-034.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-034.html
index 87ec1ae07d455..3932ceb6b7e17 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-034.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-034.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-035.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-035.html
index 1968522fecf37..f0c4394f7bae6 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-035.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-035.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-036.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-036.html
index a79740308a37d..694cb0598a8fb 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-036.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-alignment-implies-size-change-036.html
@@ -25,7 +25,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <script src="../support/style-change.js"></script>
 <script>
 function runTest() {
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-fit-content-tracks-dont-stretch-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-fit-content-tracks-dont-stretch-001.html
index 367386c2538df..8aafe35e4a0aa 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-fit-content-tracks-dont-stretch-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-fit-content-tracks-dont-stretch-001.html
@@ -37,7 +37,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 
 <body onLoad="checkLayout('.grid');">
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-001.html
index e700587bdfec7..9a2cea509c696 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-001.html
@@ -48,7 +48,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="100" data-expected-height="10"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-002.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-002.html
index 30413e0bba1b2..6c7b2dc84c26d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-002.html
@@ -52,7 +52,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="90"  data-expected-height="10"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-003.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-003.html
index 63ab28e75b0b9..a39203715a4ba 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-003.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="100" data-expected-height="10"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-004.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-004.html
index 6566e9c1f476e..1661d07c182ce 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-004.html
@@ -52,7 +52,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="100" data-expected-height="10"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-005.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-005.html
index 16890320d8c98..93b217f3c2d0d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-005.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-005.html
@@ -49,7 +49,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="100" data-expected-height="60"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-006.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-006.html
index c090ef84d49cf..683ab1be3219e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-006.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-006.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="90"  data-expected-height="60"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-007.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-007.html
index 8a5161ceb8a80..33dd6aacf5e74 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-007.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-007.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="100" data-expected-height="60"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-008.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-008.html
index d103a448ddd69..7f47b385f3e04 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-008.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-008.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="100" data-expected-height="60"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-009.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-009.html
index f971ddbf33e0f..2f8448e5b6790 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-009.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-009.html
@@ -48,7 +48,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="125" data-expected-height="20"  class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-010.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-010.html
index 1541a27a2c385..5c4adf363718a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-010.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-010.html
@@ -52,7 +52,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="110" data-expected-height="20"  class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-011.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-011.html
index dc2738b6b627f..4ac84493c9f88 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-011.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-011.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="120" data-expected-height="20"  class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-012.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-012.html
index 1c04de18e959a..91a13a04dc1c6 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-012.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-012.html
@@ -52,7 +52,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="120" data-expected-height="20"  class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-013.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-013.html
index d8acd61dd5f0d..cdfdd270c0030 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-013.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-013.html
@@ -49,7 +49,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="125" data-expected-height="80"  class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-014.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-014.html
index 0b048089c2d84..694aaaf16d783 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-014.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-014.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="110" data-expected-height="80"  class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-015.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-015.html
index dc366eb106ec7..64f6decdda4e5 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-015.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-015.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="120" data-expected-height="80"  class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-016.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-016.html
index 27dab09be528f..6f92db1dfa329 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-016.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-016.html
@@ -52,7 +52,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="120" data-expected-height="80"  class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-001.html
index 5c057624d98f0..69c17e6775294 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-001.html
@@ -49,7 +49,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="10"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-002.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-002.html
index abcf06e33385d..e4a109c1a4538 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-002.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="10"  data-expected-height="90"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-003.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-003.html
index ca185bdc5915d..54a689833730a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-003.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="10"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-004.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-004.html
index bc0b8d6ca156a..14121afaf93d8 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-004.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="10"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-005.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-005.html
index b155f5c7deda3..a274f5143d408 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-005.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-005.html
@@ -50,7 +50,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="60"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-006.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-006.html
index 23ee97951aa43..d44d724c31e0b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-006.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-006.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="60"  data-expected-height="90"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-007.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-007.html
index 5496e781b50be..03b93b6bf21fc 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-007.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-007.html
@@ -55,7 +55,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="60"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-008.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-008.html
index 556ca0f15310b..04ce3e739cce0 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-008.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-008.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="60"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-009.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-009.html
index 75433ad48d82e..c25eb368eca63 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-009.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-009.html
@@ -49,7 +49,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="20"  data-expected-height="125" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-010.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-010.html
index 7ed26cfccd4a5..b7ad29fc409d0 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-010.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-010.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="20"  data-expected-height="110" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-011.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-011.html
index 701d9a803c53e..ef6a9dc0dbc6d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-011.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-011.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="20"  data-expected-height="120" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-012.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-012.html
index 323ad98a4c744..06575bdef95fa 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-012.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-012.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="20"  data-expected-height="120" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-013.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-013.html
index dde2a18e25585..64c6c533d2f9d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-013.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-013.html
@@ -50,7 +50,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="80"  data-expected-height="125" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-014.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-014.html
index 2a80035067ced..cc2520da92c75 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-014.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-014.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="80"  data-expected-height="110" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-015.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-015.html
index 34e501f9752c8..1382c630c844e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-015.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-015.html
@@ -55,7 +55,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="80"  data-expected-height="120" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-016.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-016.html
index 5cc5a0290bf3d..3a82292586ddc 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-016.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-lr-016.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="0"   data-offset-y="0"   data-expected-width="80"  data-expected-height="120" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-001.html
index 28a78306aacd0..269d48a1ae447 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-001.html
@@ -49,7 +49,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="240" data-offset-y="0"   data-expected-width="10"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-002.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-002.html
index 297b5ff15cd2a..af1a8539189ab 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-002.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="240" data-offset-y="0"   data-expected-width="10"  data-expected-height="90"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-003.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-003.html
index e958ec266c055..9707eeff96fce 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-003.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="240" data-offset-y="0"   data-expected-width="10"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-004.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-004.html
index ef2a7e6c53767..906641a1eaa9f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-004.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="240" data-offset-y="0"   data-expected-width="10"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-005.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-005.html
index c512afe5679b7..248c521585608 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-005.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-005.html
@@ -50,7 +50,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="190" data-offset-y="0"   data-expected-width="60"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-006.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-006.html
index 584bfb9860a53..45b20c825d577 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-006.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-006.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="190" data-offset-y="0"   data-expected-width="60"  data-expected-height="90"  class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-007.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-007.html
index 257de49c97bf8..6d0dd07c25b00 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-007.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-007.html
@@ -55,7 +55,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="190" data-offset-y="0"   data-expected-width="60"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-008.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-008.html
index 4e9c264f5b672..043f83f61aa13 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-008.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-008.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="190" data-offset-y="0"   data-expected-width="60"  data-expected-height="100" class="firstRowFirstColumn">X XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-009.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-009.html
index cb66f6162eb58..96bebc75f1e5f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-009.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-009.html
@@ -49,7 +49,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="230" data-offset-y="0"   data-expected-width="20"  data-expected-height="125" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-010.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-010.html
index b551d3e6147fe..1afcfc41132d9 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-010.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-010.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="230" data-offset-y="0"   data-expected-width="20"  data-expected-height="110" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-011.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-011.html
index a56e83a2e7299..736ff947f4fc0 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-011.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-011.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="230" data-offset-y="0"   data-expected-width="20"  data-expected-height="120" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-012.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-012.html
index 91c8ce6848978..c34b435b62a84 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-012.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-012.html
@@ -53,7 +53,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="230" data-offset-y="0"   data-expected-width="20"  data-expected-height="120" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-013.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-013.html
index 20eafb785b792..6e8d324321767 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-013.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-013.html
@@ -50,7 +50,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="170" data-offset-y="0"   data-expected-width="80"  data-expected-height="125" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-014.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-014.html
index 61038b22bf053..4a72112655c85 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-014.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-014.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="170" data-offset-y="0"   data-expected-width="80"  data-expected-height="110" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-015.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-015.html
index 3cadf7f55de6f..d061174ea8354 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-015.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-015.html
@@ -55,7 +55,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="170" data-offset-y="0"   data-expected-width="80"  data-expected-height="120" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-016.html b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-016.html
index 03d6f7d78a4e9..623c026539aed 100644
--- a/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-016.html
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/alignment/grid-self-alignment-stretch-vertical-rl-016.html
@@ -54,7 +54,7 @@
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <body onload="checkLayout('.grid')">
 <div class="grid">
   <div data-offset-x="170" data-offset-y="0"   data-expected-width="80"  data-expected-height="120" class="firstRowFirstColumn">XX X</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-change-fit-content-argument-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-change-fit-content-argument-001.html
new file mode 100644
index 0000000000000..9dfb555965183
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-change-fit-content-argument-001.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Change fit-content() argument</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#track-sizing">
+<meta name="assert" content="This test checks that grid-template-{rows|columns} with fit-content() tracks recomputes the tracks when the fit-content() argument is modified.">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" href="../support/grid.css">
+<style>
+.grid {
+  width: fit-content;
+  position: relative;
+  justify-content: start;
+  align-content: start;
+  font: 25px/1 Ahem;
+}
+
+.verticalLR {
+  writing-mode: vertical-lr;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
+<script>
+function setGridTemplate(id, gridTemplateRows, gridTemplateColumns)
+{
+  var gridElement = document.getElementById(id);
+  gridElement.style.gridTemplateRows = gridTemplateRows;
+  gridElement.style.gridTemplateColumns = gridTemplateColumns;
+}
+
+function testGridItemDefinitions(gridItemData)
+{
+  var item = document.getElementById(gridItemData.id);
+  item.setAttribute("data-expected-width", gridItemData.width);
+  item.setAttribute("data-expected-height", gridItemData.height);
+  item.setAttribute("data-offset-x", gridItemData.x);
+  item.setAttribute("data-offset-y", gridItemData.y);
+
+  checkLayout(".grid", false);
+}
+
+function testChangingGridDefinitions()
+{
+  // Test changing the argument of fit-content() tracks.
+  setGridTemplate("grid1", "none", "fit-content(100px)");
+  testGridItemDefinitions({"id": "item1", "width": "100", "height": "100", "x": "0", "y": "0" });
+
+  setGridTemplate("grid1", "none", "fit-content(150px)");
+  testGridItemDefinitions({"id": "item1", "width": "150", "height": "75", "x": "0", "y": "0" });
+
+  setGridTemplate("grid2", "fit-content(100px)", "none");
+  testGridItemDefinitions({"id": "item2", "width": "100", "height": "100", "x": "0", "y": "0" });
+
+  setGridTemplate("grid2", "fit-content(150px)", "none");
+  testGridItemDefinitions({"id": "item2", "width": "75", "height": "150", "x": "0", "y": "0" });
+
+  done();
+}
+
+window.addEventListener("load", testChangingGridDefinitions, false);
+</script>
+
+<div id="grid1" class="grid">
+  <div id="item1" class="autoRowAutoColumn">XXXX XXX XX X X</div>
+</div>
+
+<div id="grid2" class="grid">
+  <div id="item2" class="autoRowAutoColumn verticalLR">XXXX XXX XX X X</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-columns-fit-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-columns-fit-content-001-ref.html
new file mode 100644
index 0000000000000..22a293990f638
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-columns-fit-content-001-ref.html
@@ -0,0 +1,351 @@
+<!DOCTYPE html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: grid-template-columns fit-content() reference file</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="stylesheet" href="../support/grid.css">
+<meta name="flags" content="ahem">
+<style>
+.grid {
+  justify-content: start;
+  width: 100px;
+  position: relative;
+  padding-top: 10px;
+  margin-bottom: 5px;
+  grid-column-gap: 5px;
+}
+
+.fc0 { grid-template-columns: minmax(auto, 0px);}
+.fc40 { grid-template-columns: minmax(auto, 40px); }
+.fc80 { grid-template-columns: minmax(auto, 80px); }
+.fc110 { grid-template-columns: auto; }
+
+.fc0x2 { grid-template-columns: repeat(2, minmax(auto, 0px));}
+.fc40x2 { grid-template-columns: repeat(2, minmax(auto, 40px)); }
+.fc80x2 { grid-template-columns: repeat(2, minmax(auto, 80px)); }
+.fc110x2 { grid-template-columns: auto auto; }
+
+.fc0p { grid-template-columns: minmax(auto, 0%); }
+.fc30p { grid-template-columns: minmax(auto, 30%); }
+.fc90p { grid-template-columns: minmax(auto, 90%); }
+.fc110p { grid-template-columns: auto; }
+
+.fc0px2 { grid-template-columns: repeat(2, minmax(auto, 0%)); }
+.fc30px2 { grid-template-columns: repeat(2, minmax(auto, 30%)); }
+.fc90px2 { grid-template-columns: repeat(2, minmax(auto, 90%)); }
+.fc110px2 { grid-template-columns: auto auto; }
+
+.item {
+  font: 10px/1 Ahem;
+  background: cyan;
+}
+
+.spanningItem {
+  font: 10px/1 Ahem;
+  grid-column: 1 / -1;
+  grid-row: 2;
+  background: salmon;
+}
+
+.test {
+  position: absolute;
+  left: 0; right: 0; top: 0;
+  height: 5px;
+  background: purple;
+}
+.test:nth-child(2n) { background: orange; }
+
+.floatLeft {
+  float: left;
+  width: 190px;
+}
+
+h3 { font-size: 1em; }
+</style>
+
+<p>The test passes if it has the same output than the reference.</p>
+
+<div class="floatLeft">
+  <h3>Only fit-content() and with fixed size tracks.</h3>
+  <div class="grid fc0">
+	<div class="item">XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc0x2">
+	<div class="item">XXX</div>
+	<div class="spanningItem">XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc40">
+	<div class="item">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: auto auto;">
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: minmax(auto, 40px) auto;">
+	<div class="item">XXX XXX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc80">
+	<div class="item">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc80x2">
+	<div class="spanningItem">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: auto minmax(auto, 80px)">
+	<div class="item autoRowSecondColumn">XXX XXX XXX</div>
+	<div class="spanningItem">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: minmax(auto, 20px) 50%;">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: minmax(10px, 40px) minmax(auto, 40px);">
+	<div class="item">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: auto minmax(10%, 200px);">
+	<div class="item autoRowSecondColumn">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+</div>
+
+<div class="floatLeft">
+  <h3>fit-content() with other content-sized tracks.</h3>
+  <div class="grid" style="grid-template-columns: minmax(auto, 40px) max-content;">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: minmax(auto, 40px) max-content;">
+	<div class="item">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: minmax(auto, 40px) max-content;">
+	<div class="item autoRowSecondColumn">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content minmax(auto, 40px);">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content minmax(auto, 40px);">
+	<div class="item">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content minmax(auto, 40px);">
+	<div class="item autoRowSecondColumn">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: minmax(auto, 30px) min-content max-content">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content minmax(auto, 30px) max-content">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content max-content minmax(auto, 30px)">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: minmax(auto, 30px) min-content max-content">
+	<div class="item" style="grid-column: 1">XXX XX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content minmax(auto, 30px) max-content">
+	<div class="item" style="grid-column: 1">XXX XX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content max-content minmax(auto, 30px)">
+	<div class="item" style="grid-column: 2">XXX XX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+</div>
+
+<div class="floatLeft">
+  <h3>fit-content() with percentage arguments.</h3>
+  <div class="grid fc0p">
+	<div class="item">XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc0px2">
+	<div class="item">XXX</div>
+	<div class="spanningItem">XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc30p">
+	<div class="item">XX XX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc30px2">
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc30px2">
+	<div class="item autoRowSecondColumn">X X X</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc90p">
+	<div class="item">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc90px2">
+	<div class="spanningItem">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: auto minmax(auto, 90%)">
+	<div class="item autoRowSecondColumn">XXX XXX XXX</div>
+	<div class="spanningItem">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+</div>
+
+<div class="floatLeft">
+  <h3>max-content < fit-content() argument.</h3>
+
+  <div class="grid fc110">
+	<div class="item">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc110x2">
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc110x2">
+	<div class="item">XXX XXX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: auto auto;">
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: auto auto;">
+	<div class="item autoRowSecondColumn">XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: max-content auto;">
+	<div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: auto min-content;">
+    <div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: max-content auto max-content;">
+	<div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+    <div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content auto min-content;">
+	<div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+    <div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: auto auto auto;">
+	<div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+    <div class="test autoRowThirdColumn"></div>
+  </div>
+
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-columns-fit-content-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-columns-fit-content-001.html
new file mode 100644
index 0000000000000..808b91c32b137
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-columns-fit-content-001.html
@@ -0,0 +1,355 @@
+<!DOCTYPE html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: grid-template-columns fit-content()</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#track-sizing">
+<link rel="match" href="grid-template-columns-fit-content-001-ref.html">
+<meta name="assert" content="This test checks that 'fit-content()' works as expected in grid-template-columns, i.e., it's similar to 'auto' ('minmax(auto, max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater than the 'auto' minimum).">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" href="../support/grid.css">
+<style>
+.grid {
+  justify-content: start;
+  width: 100px;
+  position: relative;
+  padding-top: 10px;
+  margin-bottom: 5px;
+  grid-column-gap: 5px;
+}
+
+.fc0 { grid-template-columns: fit-content(0px);}
+.fc40 { grid-template-columns: fit-content(40px); }
+.fc80 { grid-template-columns: fit-content(80px); }
+.fc110 { grid-template-columns: fit-content(110px); }
+
+.fc0x2 { grid-template-columns: repeat(2, fit-content(0px));}
+.fc40x2 { grid-template-columns: repeat(2, fit-content(40px)); }
+.fc80x2 { grid-template-columns: repeat(2, fit-content(80px)); }
+.fc110x2 { grid-template-columns: repeat(2, fit-content(110px)); }
+
+.fc0p { grid-template-columns: fit-content(0%); }
+.fc30p { grid-template-columns: fit-content(30%); }
+.fc90p { grid-template-columns: fit-content(90%); }
+.fc110p { grid-template-columns: fit-content(110%); }
+
+.fc0px2 { grid-template-columns: repeat(2, fit-content(0%)); }
+.fc30px2 { grid-template-columns: repeat(2, fit-content(30%)); }
+.fc90px2 { grid-template-columns: repeat(2, fit-content(90%)); }
+.fc110px2 { grid-template-columns: repeat(2, fit-content(110%)); }
+
+.item {
+  font: 10px/1 Ahem;
+  background: cyan;
+}
+
+.spanningItem {
+  font: 10px/1 Ahem;
+  grid-column: 1 / -1;
+  grid-row: 2;
+  background: salmon;
+}
+
+.test {
+  position: absolute;
+  left: 0; right: 0; top: 0;
+  height: 5px;
+  background: purple;
+}
+.test:nth-child(2n) { background: orange; }
+
+.floatLeft {
+  float: left;
+  width: 190px;
+}
+
+h3 { font-size: 1em; }
+
+</style>
+
+<p>The test passes if it has the same output than the reference.</p>
+
+<div class="floatLeft">
+  <h3>Only fit-content() and with fixed size tracks.</h3>
+  <div class="grid fc0">
+	<div class="item">XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc0x2">
+	<div class="item">XXX</div>
+	<div class="spanningItem">XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc40">
+	<div class="item">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc40x2">
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc40x2">
+	<div class="item">XXX XXX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc80">
+	<div class="item">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc80x2">
+	<div class="spanningItem">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc80x2">
+	<div class="item autoRowSecondColumn">XXX XXX XXX</div>
+	<div class="spanningItem">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: fit-content(20px) 50%;">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: minmax(10px, 40px) fit-content(40px);">
+	<div class="item">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: fit-content(40px) minmax(10%, 200px);">
+	<div class="item autoRowSecondColumn">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+</div>
+
+<div class="floatLeft">
+  <h3>fit-content() with other content-sized tracks.</h3>
+  <div class="grid" style="grid-template-columns: fit-content(40px) max-content;">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: fit-content(40px) max-content;">
+	<div class="item">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: fit-content(40px) max-content;">
+	<div class="item autoRowSecondColumn">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content fit-content(40px);">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content fit-content(40px);">
+	<div class="item">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content fit-content(40px);">
+	<div class="item autoRowSecondColumn">XXXXX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: fit-content(30px) min-content max-content">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content fit-content(30px) max-content">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content max-content fit-content(30px)">
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: fit-content(30px) min-content max-content">
+	<div class="item" style="grid-column: 1">XXX XX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content fit-content(30px) max-content">
+	<div class="item" style="grid-column: 1">XXX XX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content max-content fit-content(30px)">
+	<div class="item" style="grid-column: 2">XXX XX</div>
+	<div class="spanningItem">XXX XX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+	<div class="test autoRowThirdColumn"></div>
+  </div>
+</div>
+
+<div class="floatLeft">
+  <h3>fit-content() with percentage arguments.</h3>
+  <div class="grid fc0p">
+	<div class="item">XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc0px2">
+	<div class="item">XXX</div>
+	<div class="spanningItem">XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc30p">
+	<div class="item">XX XX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc30px2">
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc30px2">
+	<div class="item autoRowSecondColumn">X X X</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc90p">
+	<div class="item">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc90px2">
+	<div class="spanningItem">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc90px2">
+	<div class="item autoRowSecondColumn">XXX XXX XXX</div>
+	<div class="spanningItem">XXX XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+</div>
+
+<div class="floatLeft">
+  <h3>max-content < fit-content() argument.</h3>
+
+  <div class="grid fc110">
+	<div class="item">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+  </div>
+
+  <div class="grid fc110x2">
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid fc110x2">
+	<div class="item">XXX XXX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: fit-content(110px) fit-content(40px);">
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: fit-content(110px) fit-content(40px);">
+	<div class="item autoRowSecondColumn">XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: max-content fit-content(110px);">
+	<div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: fit-content(110px) min-content;">
+	<div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: max-content fit-content(110px) max-content;">
+	<div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+    <div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: min-content fit-content(110px) min-content;">
+	<div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+    <div class="test autoRowThirdColumn"></div>
+  </div>
+
+  <div class="grid" style="grid-template-columns: auto fit-content(110px) auto;">
+	<div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
+	<div class="spanningItem">XXX XXX</div>
+	<div class="test autoRowFirstColumn"></div>
+	<div class="test autoRowSecondColumn"></div>
+    <div class="test autoRowThirdColumn"></div>
+  </div>
+
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-rows-fit-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-rows-fit-content-001-ref.html
new file mode 100644
index 0000000000000..bff6447c6f7e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-rows-fit-content-001-ref.html
@@ -0,0 +1,348 @@
+<!DOCTYPE html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: grid-template-rows fit-content() reference file</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="stylesheet" href="../support/grid.css">
+<meta name="flags" content="ahem">
+<style>
+.grid {
+  justify-content: start;
+  align-content: start;
+  height: 100px;
+  width: 40px;
+  position: relative;
+  padding-left: 10px;
+  margin-right: 5px;
+  grid-row-gap: 5px;
+  float: left;
+}
+
+.fc0 { grid-template-rows: minmax(auto, 0px);}
+.fc40 { grid-template-rows: minmax(auto, 40px); }
+.fc80 { grid-template-rows: minmax(auto, 80px); }
+.fc110 { grid-template-rows: auto; }
+
+.fc0x2 { grid-template-rows: repeat(2, minmax(auto, 0px));}
+.fc40x2 { grid-template-rows: repeat(2, minmax(auto, 40px)); }
+.fc80x2 { grid-template-rows: repeat(2, minmax(auto, 80px)); }
+.fc110x2 { grid-template-rows: auto auto; }
+
+.fc0p { grid-template-rows: minmax(auto, 0%); }
+.fc30p { grid-template-rows: minmax(auto, 30px); }
+.fc90p { grid-template-rows: minmax(auto, 90px); }
+.fc110p { grid-template-rows: auto; }
+
+.fc0px2 { grid-template-rows: repeat(2, minmax(auto, 0%)); }
+.fc30px2 { grid-template-rows: repeat(2, minmax(auto, 30px)); }
+.fc90px2 { grid-template-rows: repeat(2, minmax(auto, 90px)); }
+.fc110px2 { grid-template-rows: auto auto; }
+
+.item {
+  font: 10px/1 Ahem;
+  background: cyan;
+}
+
+.spanningItem {
+  font: 10px/1 Ahem;
+  grid-row: 1 / -1;
+  grid-column: 2;
+  background: salmon;
+}
+
+.test {
+  position: absolute;
+  left: 0; top: 0; bottom: 0;
+  width: 5px;
+  background: purple;
+}
+.test:nth-child(2n) { background: orange; }
+
+.firstRow { grid-row: 1 / 2; }
+.secondRow { grid-row: 2 / 3; }
+.thirdRow { grid-row: 3 / 4; }
+
+div.grid > div { writing-mode: vertical-lr; }
+
+</style>
+
+<p>The test passes if it has the same output than the reference.</p>
+
+<div class="grid fc0">
+  <div class="item">XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc0x2">
+  <div class="item">XXX</div>
+  <div class="spanningItem">XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc40">
+  <div class="item">XXX XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: auto auto;">
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 40px) auto;">
+  <div class="item">XXX XXX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc80">
+  <div class="item">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc80x2">
+  <div class="spanningItem">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: auto minmax(auto, 80px)">
+  <div class="item secondRow">XXX XXX XXX</div>
+  <div class="spanningItem">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 20px) 50%;">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(10px, 40px) minmax(auto, 40px);">
+  <div class="item">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: auto minmax(10%, 200px);">
+  <div class="item secondRow">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<br clear="all">
+<br clear="all">
+
+<div class="grid" style="grid-template-rows: minmax(auto, 40px) max-content;">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 40px) max-content;">
+  <div class="item">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 40px) max-content;">
+  <div class="item secondRow">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content minmax(auto, 40px);">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content minmax(auto, 40px);">
+  <div class="item">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content minmax(auto, 40px);">
+  <div class="item secondRow">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 30px) min-content max-content">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content minmax(auto, 30px) max-content">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content max-content minmax(auto, 30px)">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 30px) min-content max-content">
+  <div class="item" style="grid-row: 1">XXX XX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content minmax(auto, 30px) max-content">
+  <div class="item" style="grid-row: 1">XXX XX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content max-content minmax(auto, 30px)">
+  <div class="item" style="grid-row: 2">XXX XX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<br clear="all">
+<br clear="all">
+
+<div class="grid fc0p">
+  <div class="item">XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc0px2">
+  <div class="item">XXX</div>
+  <div class="spanningItem">XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc30p">
+  <div class="item">XX XX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc30px2">
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc30px2">
+  <div class="item secondRow">X X X</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc90p">
+  <div class="item">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc90px2">
+  <div class="spanningItem">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: auto minmax(auto, 90px)">
+  <div class="item secondRow">XXX XXX XXX</div>
+  <div class="spanningItem">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<br clear="all">
+<br clear="all">
+
+<div class="grid fc110">
+  <div class="item">XXX XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc110x2">
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc110x2">
+  <div class="item">XXX XXX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: auto auto;">
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: auto auto;">
+  <div class="item secondRow">XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: max-content auto;">
+  <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: auto min-content;">
+  <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: max-content auto max-content;">
+  <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content auto min-content;">
+  <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: auto auto auto;">
+  <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-rows-fit-content-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-rows-fit-content-001.html
new file mode 100644
index 0000000000000..6d406c3f1b43d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/grid-definition/grid-template-rows-fit-content-001.html
@@ -0,0 +1,355 @@
+<!DOCTYPE html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: grid-template-rows fit-content()</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#track-sizing">
+<link rel="match" href="grid-template-rows-fit-content-001-ref.html">
+<meta name="assert" content="This test checks that 'fit-content()' works as expected in grid-template-rows, i.e., it's similar to 'auto' ('minmax(auto, max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater than the 'auto' minimum).">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" href="../support/grid.css">
+<style>
+.grid {
+  justify-content: start;
+  align-content: start;
+  height: 100px;
+  width: 40px;
+  position: relative;
+  padding-left: 10px;
+  margin-right: 5px;
+  grid-row-gap: 5px;
+  float: left;
+}
+
+.fc0 { grid-template-rows: fit-content(0px);}
+.fc40 { grid-template-rows: fit-content(40px); }
+.fc80 { grid-template-rows: fit-content(80px); }
+.fc110 { grid-template-rows: fit-content(110px); }
+
+.fc0x2 { grid-template-rows: repeat(2, fit-content(0px));}
+.fc40x2 { grid-template-rows: repeat(2, fit-content(40px)); }
+.fc80x2 { grid-template-rows: repeat(2, fit-content(80px)); }
+.fc110x2 { grid-template-rows: repeat(2, fit-content(110px)); }
+
+.fc0p { grid-template-rows: fit-content(0%); }
+.fc30p { grid-template-rows: fit-content(30%); }
+.fc90p { grid-template-rows: fit-content(90%); }
+.fc110p { grid-template-rows: fit-content(110%); }
+
+.fc0px2 { grid-template-rows: repeat(2, fit-content(0%)); }
+.fc30px2 { grid-template-rows: repeat(2, fit-content(30%)); }
+.fc90px2 { grid-template-rows: repeat(2, fit-content(90%)); }
+.fc110px2 { grid-template-rows: repeat(2, fit-content(110%)); }
+
+div.grid > div { writing-mode: vertical-lr; }
+
+.item {
+  font: 10px/1 Ahem;
+  background: cyan;
+}
+
+.spanningItem {
+  font: 10px/1 Ahem;
+  grid-row: 1 / -1;
+  grid-column: 2;
+  background: salmon;
+}
+
+.test {
+  position: absolute;
+  left: 0; bottom: 0; top: 0;
+  width: 5px;
+  background: purple;
+}
+.test:nth-child(2n) { background: orange; }
+
+.firstRow { grid-row: 1 / 2; }
+.secondRow { grid-row: 2 / 3; }
+.thirdRow { grid-row: 3 / 4; }
+
+h3 { font-size: 1em; }
+.container { float: left; height: 110px;}
+
+</style>
+
+<p>The test passes if it has the same output than the reference.</p>
+
+<div class="grid fc0">
+  <div class="item">XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc0x2">
+  <div class="item">XXX</div>
+  <div class="spanningItem">XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc40">
+  <div class="item">XXX XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc40x2">
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc40x2">
+  <div class="item">XXX XXX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc80">
+  <div class="item">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc80x2">
+  <div class="spanningItem">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc80x2">
+  <div class="item secondRow">XXX XXX XXX</div>
+  <div class="spanningItem">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: fit-content(20px) 50%;">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(10px, 40px) fit-content(40px);">
+  <div class="item">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: fit-content(40px) minmax(10%, 200px);">
+  <div class="item secondRow">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+</div>
+
+<br clear ="all">
+<br clear ="all">
+
+<div class="grid" style="grid-template-rows: fit-content(40px) max-content;">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: fit-content(40px) max-content;">
+  <div class="item">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: fit-content(40px) max-content;">
+  <div class="item secondRow">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content fit-content(40px);">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content fit-content(40px);">
+  <div class="item">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content fit-content(40px);">
+  <div class="item secondRow">XXXXX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: fit-content(30px) min-content max-content">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content fit-content(30px) max-content">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content max-content fit-content(30px)">
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: fit-content(30px) min-content max-content">
+  <div class="item" style="grid-row: 1">XXX XX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content fit-content(30px) max-content">
+  <div class="item" style="grid-row: 1">XXX XX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content max-content fit-content(30px)">
+  <div class="item" style="grid-row: 2">XXX XX</div>
+  <div class="spanningItem">XXX XX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<br clear="all">
+<br clear="all">
+
+<div class="grid fc0p">
+  <div class="item">XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc0px2">
+  <div class="item">XXX</div>
+  <div class="spanningItem">XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc30p">
+  <div class="item">XX XX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc30px2">
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc30px2">
+  <div class="item secondRow">X X X</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc90p">
+  <div class="item">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc90px2">
+  <div class="spanningItem">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc90px2">
+  <div class="item secondRow">XXX XXX XXX</div>
+  <div class="spanningItem">XXX XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<br clear="all">
+<br clear="all">
+
+<div class="grid fc110">
+  <div class="item">XXX XXX</div>
+  <div class="test firstRow"></div>
+</div>
+
+<div class="grid fc110x2">
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid fc110x2">
+  <div class="item">XXX XXX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: fit-content(110px) fit-content(40px);">
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: fit-content(110px) fit-content(40px);">
+  <div class="item secondRow">XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: max-content fit-content(110px);">
+  <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: fit-content(110px) min-content;">
+  <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: max-content fit-content(110px) max-content;">
+  <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: min-content fit-content(110px) min-content;">
+  <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: auto fit-content(110px) auto;">
+  <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
+  <div class="spanningItem">XXX XXX</div>
+  <div class="test firstRow"></div>
+  <div class="test secondRow"></div>
+  <div class="test thirdRow"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/grid-model/grid-box-sizing-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/grid-model/grid-box-sizing-001.html
new file mode 100644
index 0000000000000..825d35e85bd9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/grid-model/grid-box-sizing-001.html
@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Grid container and tracks sizes with box-sizing property</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#intrinsic-sizes">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#box-sizing">
+<meta name="assert" content="The test checks the sizes of a grid container and its track depending on min-size constraints and the box-sizing property.">
+<style>
+.wrapper {
+  position: relative;
+  width: 200px;
+  height: 100px;
+}
+
+.grid {
+  position: absolute;
+  left: 0;
+  top: 0;
+  display: grid;
+  border-style: solid;
+  border-width: 5px 10px 15px 20px;
+  padding: 17px 13px 7px 3px;
+}
+
+.wholeWidth {
+  right: 0;
+}
+
+.wholeHeight {
+  bottom: 0;
+}
+.item {
+  background: cyan;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div id="log"></div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="height: 100px;" data-expected-width="200" data-expected-height="144">
+    <div class="item" data-expected-width="154" data-expected-height="100"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="min-height: 100px;" data-expected-width="200" data-expected-height="144">
+    <div class="item" data-expected-width="154" data-expected-height="100"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="height: 100px; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="min-height: 100px; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="bottom: 0;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="bottom: 0;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="bottom: 0; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="bottom: 0; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="height: 100px; bottom: 0;" data-expected-width="200" data-expected-height="144">
+    <div class="item" data-expected-width="154" data-expected-height="100"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="min-height: 100px; bottom: 0;" data-expected-width="200" data-expected-height="144">
+    <div class="item" data-expected-width="154" data-expected-height="100"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="height: 100px; bottom: 0; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeWidth" style="min-height: 100px; bottom: 0; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="width: 200px;" data-expected-width="246" data-expected-height="100">
+    <div class="item" data-expected-width="200" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="min-width: 200px;" data-expected-width="246" data-expected-height="100">
+    <div class="item" data-expected-width="200" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="width: 200px; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="min-width: 200px; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="right: 0;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="right: 0;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="right: 0; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="right: 0; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="width: 200px; right: 0;" data-expected-width="246" data-expected-height="100">
+    <div class="item" data-expected-width="200" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="min-width: 200px; right: 0;" data-expected-width="246" data-expected-height="100">
+    <div class="item" data-expected-width="200" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="width: 200px; right: 0; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="grid wholeHeight" style="min-width: 200px; right: 0; box-sizing: border-box;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-expected-width="154" data-expected-height="56"></div>
+  </div>
+</div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/layout-algorithm/grid-stretch-respects-min-size-001.html b/tests/wpt/web-platform-tests/css/css-grid-1/layout-algorithm/grid-stretch-respects-min-size-001.html
new file mode 100644
index 0000000000000..29eca9dbc6f57
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid-1/layout-algorithm/grid-stretch-respects-min-size-001.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: stretch alignment respects min size constraints of the grid container</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#algo-stretch">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-align">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="The test checks that during the last step of the track sizing algorithm (stretch auto tracks), the min-width/height constraints of the grid container are respected.">
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+
+  #constrained-wrapper {
+    width: 50px;
+    height: 50px;
+  }
+
+  #grid {
+    display: grid;
+    min-width: 100px;
+    min-height: 100px;
+  }
+
+  #test-item-overlapping-green {
+    background: green;
+  }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div id="constrained-wrapper">
+  <div id="grid">
+    <div id="test-item-overlapping-green"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid-1/support/check-layout-th.js b/tests/wpt/web-platform-tests/css/css-grid-1/support/check-layout-th.js
deleted file mode 100644
index 07f7d5ded829e..0000000000000
--- a/tests/wpt/web-platform-tests/css/css-grid-1/support/check-layout-th.js
+++ /dev/null
@@ -1,190 +0,0 @@
-(function() {
-// Test is initiated from body.onload, so explicit done() call is required.
-setup({ explicit_done: true });
-
-function checkSubtreeExpectedValues(t, parent, prefix)
-{
-    var checkedLayout = checkExpectedValues(t, parent, prefix);
-    Array.prototype.forEach.call(parent.childNodes, function(node) {
-        checkedLayout |= checkSubtreeExpectedValues(t, node, prefix);
-    });
-    return checkedLayout;
-}
-
-function checkAttribute(output, node, attribute)
-{
-    var result = node.getAttribute && node.getAttribute(attribute);
-    output.checked |= !!result;
-    return result;
-}
-
-function assert_tolerance(actual, expected, message)
-{
-    if (isNaN(expected) || Math.abs(actual - expected) >= 1) {
-        assert_equals(actual, Number(expected), message);
-    }
-}
-
-function checkExpectedValues(t, node, prefix)
-{
-    var output = { checked: false };
-
-    var expectedWidth = checkAttribute(output, node, "data-expected-width");
-    if (expectedWidth) {
-        assert_tolerance(node.offsetWidth, expectedWidth, prefix + "width");
-    }
-
-    var expectedHeight = checkAttribute(output, node, "data-expected-height");
-    if (expectedHeight) {
-        assert_tolerance(node.offsetHeight, expectedHeight, prefix + "height");
-    }
-
-    var expectedOffset = checkAttribute(output, node, "data-offset-x");
-    if (expectedOffset) {
-        assert_tolerance(node.offsetLeft, expectedOffset, prefix + "offsetLeft");
-    }
-
-    var expectedOffset = checkAttribute(output, node, "data-offset-y");
-    if (expectedOffset) {
-        assert_tolerance(node.offsetTop, expectedOffset, prefix + "offsetTop");
-    }
-
-    var expectedWidth = checkAttribute(output, node, "data-expected-client-width");
-    if (expectedWidth) {
-        assert_tolerance(node.clientWidth, expectedWidth, prefix + "clientWidth");
-    }
-
-    var expectedHeight = checkAttribute(output, node, "data-expected-client-height");
-    if (expectedHeight) {
-        assert_tolerance(node.clientHeight, expectedHeight, prefix + "clientHeight");
-    }
-
-    var expectedWidth = checkAttribute(output, node, "data-expected-scroll-width");
-    if (expectedWidth) {
-        assert_tolerance(node.scrollWidth, expectedWidth, prefix + "scrollWidth");
-    }
-
-    var expectedHeight = checkAttribute(output, node, "data-expected-scroll-height");
-    if (expectedHeight) {
-        assert_tolerance(node.scrollHeight, expectedHeight, prefix + "scrollHeight");
-    }
-
-    var expectedOffset = checkAttribute(output, node, "data-total-x");
-    if (expectedOffset) {
-        var totalLeft = node.clientLeft + node.offsetLeft;
-        assert_tolerance(totalLeft, expectedOffset, prefix +
-                         "clientLeft+offsetLeft (" + node.clientLeft + " + " + node.offsetLeft + ")");
-    }
-
-    var expectedOffset = checkAttribute(output, node, "data-total-y");
-    if (expectedOffset) {
-        var totalTop = node.clientTop + node.offsetTop;
-        assert_tolerance(totalTop, expectedOffset, prefix +
-                         "clientTop+offsetTop (" + node.clientTop + " + " + node.offsetTop + ")");
-    }
-
-    var expectedDisplay = checkAttribute(output, node, "data-expected-display");
-    if (expectedDisplay) {
-        var actualDisplay = getComputedStyle(node).display;
-        assert_equals(actualDisplay, expectedDisplay, prefix + "display");
-    }
-
-    var expectedPaddingTop = checkAttribute(output, node, "data-expected-padding-top");
-    if (expectedPaddingTop) {
-        var actualPaddingTop = getComputedStyle(node).paddingTop;
-        // Trim the unit "px" from the output.
-        actualPaddingTop = actualPaddingTop.slice(0, -2);
-        assert_equals(actualPaddingTop, expectedPaddingTop, prefix + "padding-top");
-    }
-
-    var expectedPaddingBottom = checkAttribute(output, node, "data-expected-padding-bottom");
-    if (expectedPaddingBottom) {
-        var actualPaddingBottom = getComputedStyle(node).paddingBottom;
-        // Trim the unit "px" from the output.
-        actualPaddingBottom = actualPaddingBottom.slice(0, -2);
-        assert_equals(actualPaddingBottom, expectedPaddingBottom, prefix + "padding-bottom");
-    }
-
-    var expectedPaddingLeft = checkAttribute(output, node, "data-expected-padding-left");
-    if (expectedPaddingLeft) {
-        var actualPaddingLeft = getComputedStyle(node).paddingLeft;
-        // Trim the unit "px" from the output.
-        actualPaddingLeft = actualPaddingLeft.slice(0, -2);
-        assert_equals(actualPaddingLeft, expectedPaddingLeft, prefix + "padding-left");
-    }
-
-    var expectedPaddingRight = checkAttribute(output, node, "data-expected-padding-right");
-    if (expectedPaddingRight) {
-        var actualPaddingRight = getComputedStyle(node).paddingRight;
-        // Trim the unit "px" from the output.
-        actualPaddingRight = actualPaddingRight.slice(0, -2);
-        assert_equals(actualPaddingRight, expectedPaddingRight, prefix + "padding-right");
-    }
-
-    var expectedMarginTop = checkAttribute(output, node, "data-expected-margin-top");
-    if (expectedMarginTop) {
-        var actualMarginTop = getComputedStyle(node).marginTop;
-        // Trim the unit "px" from the output.
-        actualMarginTop = actualMarginTop.slice(0, -2);
-        assert_equals(actualMarginTop, expectedMarginTop, prefix + "margin-top");
-    }
-
-    var expectedMarginBottom = checkAttribute(output, node, "data-expected-margin-bottom");
-    if (expectedMarginBottom) {
-        var actualMarginBottom = getComputedStyle(node).marginBottom;
-        // Trim the unit "px" from the output.
-        actualMarginBottom = actualMarginBottom.slice(0, -2);
-        assert_equals(actualMarginBottom, expectedMarginBottom, prefix + "margin-bottom");
-    }
-
-    var expectedMarginLeft = checkAttribute(output, node, "data-expected-margin-left");
-    if (expectedMarginLeft) {
-        var actualMarginLeft = getComputedStyle(node).marginLeft;
-        // Trim the unit "px" from the output.
-        actualMarginLeft = actualMarginLeft.slice(0, -2);
-        assert_equals(actualMarginLeft, expectedMarginLeft, prefix + "margin-left");
-    }
-
-    var expectedMarginRight = checkAttribute(output, node, "data-expected-margin-right");
-    if (expectedMarginRight) {
-        var actualMarginRight = getComputedStyle(node).marginRight;
-        // Trim the unit "px" from the output.
-        actualMarginRight = actualMarginRight.slice(0, -2);
-        assert_equals(actualMarginRight, expectedMarginRight, prefix + "margin-right");
-    }
-
-    return output.checked;
-}
-
-window.checkLayout = function(selectorList, outputContainer)
-{
-    if (!selectorList) {
-        console.error("You must provide a CSS selector of nodes to check.");
-        return;
-    }
-    var nodes = document.querySelectorAll(selectorList);
-    var testNumber = 0;
-    nodes = Array.prototype.slice.call(nodes);
-    nodes.reverse();
-    var checkedLayout = false;
-    Array.prototype.forEach.call(nodes, function(node) {
-        test(function(t) {
-            var container = node.parentNode.className == 'container' ? node.parentNode : node;
-            var prefix = "\n" + container.outerHTML + "\n";
-            var passed = false;
-            try {
-                checkedLayout |= checkExpectedValues(t, node.parentNode, prefix);
-                checkedLayout |= checkSubtreeExpectedValues(t, node, prefix);
-                passed = true;
-            } finally {
-                checkedLayout |= !passed;
-            }
-        }, selectorList + ' ' + String(++testNumber));
-    });
-    if (!checkedLayout) {
-        console.error("No valid data-* attributes found in selector list : " + selectorList);
-    }
-    done();
-};
-
-})();
diff --git a/tests/wpt/web-platform-tests/css/css-images-3/gradients-with-transparent-ref.html b/tests/wpt/web-platform-tests/css/css-images-3/gradients-with-transparent-ref.html
new file mode 100644
index 0000000000000..9f52476b2a62b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images-3/gradients-with-transparent-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Linear gradient with transparent reference</title>
+<style>
+    .test {
+        width: 200px;
+        height: 100px;
+        margin-left: 90px;
+    }
+    .gradient {
+        background-image: linear-gradient(to left, blue 0%, blue 20%, rgba(0,0,255,0));
+    }
+</style>
+
+<body>
+    <p>Gradient using 'transparent'</p>
+    <div id="gradient1" class="test gradient"></div>
+    <br />
+    <p>Gradient using rgba(0,0,255,0)</p>
+    <div id="gradient2" class="test gradient"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-images-3/gradients-with-transparent.html b/tests/wpt/web-platform-tests/css/css-images-3/gradients-with-transparent.html
new file mode 100644
index 0000000000000..e4505bc282ec0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images-3/gradients-with-transparent.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Gradients with transparent</title>
+<link rel="help" href="https://www.w3.org/TR/css3-images/#linear-gradients">
+<link rel="match" href="gradients-with-transparent-ref.html">
+<meta name="assert" content="The blue gradients to 'transparent' keyword, and rgba(0,0,0,0), match the gradient to rgba(0,0,255,0)">
+<style>
+    .test {
+        width: 200px;
+        height: 100px;
+        margin-left: 90px;
+    }
+    #gradient1 {
+        background-image: linear-gradient(to left, blue 0%, blue 20%, transparent);
+    }
+    #gradient2 {
+        background-image: linear-gradient(to left, blue 0%, blue 20%, rgba(0,0,0,0));
+    }
+</style>
+<body>
+	<p>Gradient using 'transparent'</p>
+    <div id="gradient1" class="test"></div>
+    <br />
+	<p>Gradient using rgba(0,0,255,0)</p>
+    <div id="gradient2" class="test"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-tables-3/fixed-layout-calc-width-001.html b/tests/wpt/web-platform-tests/css/css-tables-3/fixed-layout-calc-width-001.html
index 91c665ee2d480..4d3622bb93280 100644
--- a/tests/wpt/web-platform-tests/css/css-tables-3/fixed-layout-calc-width-001.html
+++ b/tests/wpt/web-platform-tests/css/css-tables-3/fixed-layout-calc-width-001.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <link rel="author" title="David Grogan" href="dgrogan@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-tables-3/#distributing-width-to-columns">
 
diff --git a/tests/wpt/web-platform-tests/css/css-tables-3/fixed-layout-excess-width-distribution-001.html b/tests/wpt/web-platform-tests/css/css-tables-3/fixed-layout-excess-width-distribution-001.html
index a9a78bd59b0dc..a2d1884b58577 100644
--- a/tests/wpt/web-platform-tests/css/css-tables-3/fixed-layout-excess-width-distribution-001.html
+++ b/tests/wpt/web-platform-tests/css/css-tables-3/fixed-layout-excess-width-distribution-001.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/check-layout-th.js"></script>
+<script src="/resources/check-layout-th.js">"></script>
 <link rel="author" title="David Grogan" href="dgrogan@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-tables-3/#distributing-width-to-columns">
 
diff --git a/tests/wpt/web-platform-tests/css/css-tables-3/support/check-layout-th.js b/tests/wpt/web-platform-tests/css/css-tables-3/support/check-layout-th.js
deleted file mode 100644
index 07f7d5ded829e..0000000000000
--- a/tests/wpt/web-platform-tests/css/css-tables-3/support/check-layout-th.js
+++ /dev/null
@@ -1,190 +0,0 @@
-(function() {
-// Test is initiated from body.onload, so explicit done() call is required.
-setup({ explicit_done: true });
-
-function checkSubtreeExpectedValues(t, parent, prefix)
-{
-    var checkedLayout = checkExpectedValues(t, parent, prefix);
-    Array.prototype.forEach.call(parent.childNodes, function(node) {
-        checkedLayout |= checkSubtreeExpectedValues(t, node, prefix);
-    });
-    return checkedLayout;
-}
-
-function checkAttribute(output, node, attribute)
-{
-    var result = node.getAttribute && node.getAttribute(attribute);
-    output.checked |= !!result;
-    return result;
-}
-
-function assert_tolerance(actual, expected, message)
-{
-    if (isNaN(expected) || Math.abs(actual - expected) >= 1) {
-        assert_equals(actual, Number(expected), message);
-    }
-}
-
-function checkExpectedValues(t, node, prefix)
-{
-    var output = { checked: false };
-
-    var expectedWidth = checkAttribute(output, node, "data-expected-width");
-    if (expectedWidth) {
-        assert_tolerance(node.offsetWidth, expectedWidth, prefix + "width");
-    }
-
-    var expectedHeight = checkAttribute(output, node, "data-expected-height");
-    if (expectedHeight) {
-        assert_tolerance(node.offsetHeight, expectedHeight, prefix + "height");
-    }
-
-    var expectedOffset = checkAttribute(output, node, "data-offset-x");
-    if (expectedOffset) {
-        assert_tolerance(node.offsetLeft, expectedOffset, prefix + "offsetLeft");
-    }
-
-    var expectedOffset = checkAttribute(output, node, "data-offset-y");
-    if (expectedOffset) {
-        assert_tolerance(node.offsetTop, expectedOffset, prefix + "offsetTop");
-    }
-
-    var expectedWidth = checkAttribute(output, node, "data-expected-client-width");
-    if (expectedWidth) {
-        assert_tolerance(node.clientWidth, expectedWidth, prefix + "clientWidth");
-    }
-
-    var expectedHeight = checkAttribute(output, node, "data-expected-client-height");
-    if (expectedHeight) {
-        assert_tolerance(node.clientHeight, expectedHeight, prefix + "clientHeight");
-    }
-
-    var expectedWidth = checkAttribute(output, node, "data-expected-scroll-width");
-    if (expectedWidth) {
-        assert_tolerance(node.scrollWidth, expectedWidth, prefix + "scrollWidth");
-    }
-
-    var expectedHeight = checkAttribute(output, node, "data-expected-scroll-height");
-    if (expectedHeight) {
-        assert_tolerance(node.scrollHeight, expectedHeight, prefix + "scrollHeight");
-    }
-
-    var expectedOffset = checkAttribute(output, node, "data-total-x");
-    if (expectedOffset) {
-        var totalLeft = node.clientLeft + node.offsetLeft;
-        assert_tolerance(totalLeft, expectedOffset, prefix +
-                         "clientLeft+offsetLeft (" + node.clientLeft + " + " + node.offsetLeft + ")");
-    }
-
-    var expectedOffset = checkAttribute(output, node, "data-total-y");
-    if (expectedOffset) {
-        var totalTop = node.clientTop + node.offsetTop;
-        assert_tolerance(totalTop, expectedOffset, prefix +
-                         "clientTop+offsetTop (" + node.clientTop + " + " + node.offsetTop + ")");
-    }
-
-    var expectedDisplay = checkAttribute(output, node, "data-expected-display");
-    if (expectedDisplay) {
-        var actualDisplay = getComputedStyle(node).display;
-        assert_equals(actualDisplay, expectedDisplay, prefix + "display");
-    }
-
-    var expectedPaddingTop = checkAttribute(output, node, "data-expected-padding-top");
-    if (expectedPaddingTop) {
-        var actualPaddingTop = getComputedStyle(node).paddingTop;
-        // Trim the unit "px" from the output.
-        actualPaddingTop = actualPaddingTop.slice(0, -2);
-        assert_equals(actualPaddingTop, expectedPaddingTop, prefix + "padding-top");
-    }
-
-    var expectedPaddingBottom = checkAttribute(output, node, "data-expected-padding-bottom");
-    if (expectedPaddingBottom) {
-        var actualPaddingBottom = getComputedStyle(node).paddingBottom;
-        // Trim the unit "px" from the output.
-        actualPaddingBottom = actualPaddingBottom.slice(0, -2);
-        assert_equals(actualPaddingBottom, expectedPaddingBottom, prefix + "padding-bottom");
-    }
-
-    var expectedPaddingLeft = checkAttribute(output, node, "data-expected-padding-left");
-    if (expectedPaddingLeft) {
-        var actualPaddingLeft = getComputedStyle(node).paddingLeft;
-        // Trim the unit "px" from the output.
-        actualPaddingLeft = actualPaddingLeft.slice(0, -2);
-        assert_equals(actualPaddingLeft, expectedPaddingLeft, prefix + "padding-left");
-    }
-
-    var expectedPaddingRight = checkAttribute(output, node, "data-expected-padding-right");
-    if (expectedPaddingRight) {
-        var actualPaddingRight = getComputedStyle(node).paddingRight;
-        // Trim the unit "px" from the output.
-        actualPaddingRight = actualPaddingRight.slice(0, -2);
-        assert_equals(actualPaddingRight, expectedPaddingRight, prefix + "padding-right");
-    }
-
-    var expectedMarginTop = checkAttribute(output, node, "data-expected-margin-top");
-    if (expectedMarginTop) {
-        var actualMarginTop = getComputedStyle(node).marginTop;
-        // Trim the unit "px" from the output.
-        actualMarginTop = actualMarginTop.slice(0, -2);
-        assert_equals(actualMarginTop, expectedMarginTop, prefix + "margin-top");
-    }
-
-    var expectedMarginBottom = checkAttribute(output, node, "data-expected-margin-bottom");
-    if (expectedMarginBottom) {
-        var actualMarginBottom = getComputedStyle(node).marginBottom;
-        // Trim the unit "px" from the output.
-        actualMarginBottom = actualMarginBottom.slice(0, -2);
-        assert_equals(actualMarginBottom, expectedMarginBottom, prefix + "margin-bottom");
-    }
-
-    var expectedMarginLeft = checkAttribute(output, node, "data-expected-margin-left");
-    if (expectedMarginLeft) {
-        var actualMarginLeft = getComputedStyle(node).marginLeft;
-        // Trim the unit "px" from the output.
-        actualMarginLeft = actualMarginLeft.slice(0, -2);
-        assert_equals(actualMarginLeft, expectedMarginLeft, prefix + "margin-left");
-    }
-
-    var expectedMarginRight = checkAttribute(output, node, "data-expected-margin-right");
-    if (expectedMarginRight) {
-        var actualMarginRight = getComputedStyle(node).marginRight;
-        // Trim the unit "px" from the output.
-        actualMarginRight = actualMarginRight.slice(0, -2);
-        assert_equals(actualMarginRight, expectedMarginRight, prefix + "margin-right");
-    }
-
-    return output.checked;
-}
-
-window.checkLayout = function(selectorList, outputContainer)
-{
-    if (!selectorList) {
-        console.error("You must provide a CSS selector of nodes to check.");
-        return;
-    }
-    var nodes = document.querySelectorAll(selectorList);
-    var testNumber = 0;
-    nodes = Array.prototype.slice.call(nodes);
-    nodes.reverse();
-    var checkedLayout = false;
-    Array.prototype.forEach.call(nodes, function(node) {
-        test(function(t) {
-            var container = node.parentNode.className == 'container' ? node.parentNode : node;
-            var prefix = "\n" + container.outerHTML + "\n";
-            var passed = false;
-            try {
-                checkedLayout |= checkExpectedValues(t, node.parentNode, prefix);
-                checkedLayout |= checkSubtreeExpectedValues(t, node, prefix);
-                passed = true;
-            } finally {
-                checkedLayout |= !passed;
-            }
-        }, selectorList + ' ' + String(++testNumber));
-    });
-    if (!checkedLayout) {
-        console.error("No valid data-* attributes found in selector list : " + selectorList);
-    }
-    done();
-};
-
-})();
diff --git a/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-004.html b/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-004.html
index eedaa61834519..820a93303ceb7 100644
--- a/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-004.html
+++ b/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-004.html
@@ -4,7 +4,7 @@
 <link rel="help" href="http://www.w3.org/TR/css3-ui/#cursor">
 <meta name="flags" content="interact">
 <meta charset="UTF-8">
-<meta name="assert" content="The 'auto' cursor value does the same as 'text' over text.">
+<meta name="assert" content="The 'auto' cursor value does the same as 'default' over non-textual content.">
 <style>
 div {
   width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-005.html b/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-005.html
index ad11863b5982b..cb5ab8e5a51e4 100644
--- a/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-005.html
+++ b/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-005.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <title>CSS Basic User Interface Test: cursor:auto on form elements</title>
-<link rel="author" title="Florian Rivoal" href="mailto:florian@rivoal.net">
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
 <link rel="help" href="http://www.w3.org/TR/css3-ui/#cursor">
 <meta name="flags" content="interact">
 <meta charset="UTF-8">
-<meta name="assert" content="The 'auto' cursor value does the same as 'default' over everything other than text, such as form elements.">
+<meta name="assert" content="The 'auto' cursor value does the same as 'default' over everything other than selectable text or editable elements, such as form elements that do not take text input.">
 <style>
 #test {
   border: solid blue;
@@ -33,8 +33,6 @@
   <p>Place the cursor into the orange box for a reference of what this should look like.</p>
   <div id=test>
     <button>button</button>
-    <textarea></textarea>
-    <input>
     <input type=button value=input-button>
     <select></select>
   </div>
diff --git a/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-006.html b/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-006.html
new file mode 100644
index 0000000000000..7385beec8e640
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-006.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<title>CSS Basic User Interface Test: cursor:auto on editable elements</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<link rel="help" href="http://www.w3.org/TR/css3-ui/#cursor">
+<meta name="flags" content="interact">
+<meta charset="UTF-8">
+<meta name="assert" content="The 'auto' cursor value does the same as 'text' over editable elements.">
+<style>
+#test {
+  border: solid blue;
+  width: 200px;
+  cursor: auto;
+}
+#test * {
+  cursor: url("support/cursors/fail.png"), help !important; /* Override UA styles, regardless of specificity */
+  cursor: auto !important; /* Override UA styles, regardless of specificity */
+  resize: none; /* The appearance of the cursor over UA provided resize controls is out of scope. */
+  overflow: hidden; /* The appearance of the cursor over UA provided scroll controls is out of scope */
+}
+#ref {
+  width: 100px;
+  height: 100px;
+  cursor: text;
+  border: solid orange;
+}
+:root {
+  cursor: help; /* give the root element a different cursor so that
+  it is easy to tell if something changes when hovering the target.*/
+}
+
+[contenteditable] {
+  border: solid;
+  height: 1em;
+  margin: 5px;
+}
+</style>
+<body>
+  <p>The test passes if, when moved over every element inside the blue box, the cursor looks like the text insertion and selection cursor.</p>
+  <p>Place the cursor into the orange box for a reference of what this should look like.</p>
+  <div id=test>
+    <textarea></textarea>
+    <input>
+    <div contenteditable=true style="border:solid"></div>
+  </div>
+  <div id=ref></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-007.html b/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-007.html
new file mode 100644
index 0000000000000..6cf1495a02c42
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui-3/cursor-auto-007.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<title>CSS Basic User Interface Test: cursor:auto on unselectable text</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<link rel="help" href="http://www.w3.org/TR/css3-ui/#cursor">
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#content-selection">
+<meta name="flags" content="interact">
+<meta charset="UTF-8">
+<meta name="assert" content="The 'auto' cursor value does the same as 'default' over unselectable text.">
+<style>
+#test {
+  border: solid blue;
+  width: 200px;
+  cursor: auto;
+}
+#test * {
+  cursor: url("support/cursors/fail.png"), help !important; /* Override UA styles, regardless of specificity */
+  cursor: auto !important; /* Override UA styles, regardless of specificity */
+}
+#ref {
+  width: 100px;
+  height: 100px;
+  cursor: default;
+  border: solid orange;
+}
+:root {
+  cursor: help; /* give the root element a different cursor so that
+  it is easy to tell if something changes when hovering the target.*/
+}
+
+/* Hide the text if we cannot make it unselectable.
+ user-select is not part of css-ui level 3, so we should not depend on it
+ but it is nice to test it if it is supported.
+ Test for level 4 can take the conditional out. */
+.unselectable { display: none; }
+@supports (user-select: none) or (-webkit-user-select: none) {
+  .unselectable {
+    display: block;
+    user-select: none;
+    -webkit-user-select: none; /* Yes, vendor prefixes are ugly. But this one was grandfathered in and support is required by spec. */
+  }
+}
+
+</style>
+<body>
+  <p>The test passes if, when moved over every element inside the blue box, the cursor remains the platform-dependent default cursor.</p>
+  <p>Place the cursor into the orange box for a reference of what this should look like.</p>
+  <div id=test>
+    <!-- text in a button is either not considered text because it's in a replaced element,
+      or it is text but it is unselectable, eitherway, we should get the default cursor-->
+    <button>Text in a button</button>
+
+    <div class=unselectable>Unselectable text</div>
+  </div>
+  <div id=ref></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-ui-3/cursor-image-006.html b/tests/wpt/web-platform-tests/css/css-ui-3/cursor-image-006.html
index d4b6b55afe794..c123a65f2a0d3 100644
--- a/tests/wpt/web-platform-tests/css/css-ui-3/cursor-image-006.html
+++ b/tests/wpt/web-platform-tests/css/css-ui-3/cursor-image-006.html
@@ -2,7 +2,7 @@
 <title>CSS Basic User Interface Test: Cursor property, url value</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="http://www.w3.org/TR/css3-ui/#cursor">
-<meta name="flags" content="interact image animated">
+<meta name="flags" content="interact image animated may">
 <meta charset="UTF-8">
 <meta name="assert" content="Test checks that an ANI image, with it's own hotspot, is supported as a custom cursor.">
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css3-color/t44-currentcolor-inherited-c-ref.xht b/tests/wpt/web-platform-tests/css/css3-color/t44-currentcolor-inherited-c-ref.xht
new file mode 100644
index 0000000000000..85a391d5a2cda
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css3-color/t44-currentcolor-inherited-c-ref.xht
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>"This paragraph" green background ref</title>
+    <style type="text/css"><![CDATA[
+    p {
+    background: green;
+    color: white;
+    }
+    ]]></style>
+  </head>
+  <body>
+    <p>This paragraph should have a green background.</p>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css3-color/t44-currentcolor-inherited-c.xht b/tests/wpt/web-platform-tests/css/css3-color/t44-currentcolor-inherited-c.xht
index 8b8fefccaf382..402dff1644980 100644
--- a/tests/wpt/web-platform-tests/css/css3-color/t44-currentcolor-inherited-c.xht
+++ b/tests/wpt/web-platform-tests/css/css3-color/t44-currentcolor-inherited-c.xht
@@ -7,6 +7,7 @@
 		<link rel="reviewer" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#currentcolor" />
 		<link rel="help" href="http://www.w3.org/Style/2011/REC-css3-color-20110607-errata.html#s.4.5" />
+		<link rel="match" href="t44-currentcolor-inherited-c-ref.xht" />
 		<meta name="flags" content="" />
 		<meta name="assert" content="currentColor is a computed value" />
 		<style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/color-interpolation-filters-parsing-invalid.html b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/color-interpolation-filters-parsing-invalid.html
new file mode 100644
index 0000000000000..3aca3734eaad6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/color-interpolation-filters-parsing-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Filter Effects Module Level 1: parsing color-interpolation-filters with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#ColorInterpolationFiltersProperty">
+<meta name="assert" content="color-interpolation-filters supports only the grammar 'auto | sRGB | linearRGB'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("color-interpolation-filters", "none");
+test_invalid_value("color-interpolation-filters", "linearRGB sRGB");
+test_invalid_value("color-interpolation-filters", "auto sRGB linearRGB");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/color-interpolation-filters-parsing-valid.html b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/color-interpolation-filters-parsing-valid.html
new file mode 100644
index 0000000000000..d2e89a3625853
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/color-interpolation-filters-parsing-valid.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Filter Effects Module Level 1: parsing color-interpolation-filters with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#ColorInterpolationFiltersProperty">
+<meta name="assert" content="color-interpolation-filters supports the full grammar 'auto | sRGB | linearRGB'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("color-interpolation-filters", "auto");
+
+// Blink serializes these keywords as mixed case. Firefox serializes as lowercase.
+test_valid_value("color-interpolation-filters", "sRGB", ["sRGB", "srgb"]);
+test_valid_value("color-interpolation-filters", "srgb", ["sRGB", "srgb"]);
+test_valid_value("color-interpolation-filters", "SrGb", ["sRGB", "srgb"]);
+test_valid_value("color-interpolation-filters", "linearRGB", ["linearRGB", "linearrgb"]);
+test_valid_value("color-interpolation-filters", "linearrgb", ["linearRGB", "linearrgb"]);
+test_valid_value("color-interpolation-filters", "LiNeArRgB", ["linearRGB", "linearrgb"]);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/filter-parsing-invalid.html b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/filter-parsing-invalid.html
new file mode 100644
index 0000000000000..add2875716d80
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/filter-parsing-invalid.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Filter Effects Module Level 1: parsing filter with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#FilterProperty">
+<meta name="assert" content="filter supports only the grammar 'none | <filter-function-list>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+// Edge fails: expected "" but got "none"
+
+test_invalid_value("filter", "auto");
+test_invalid_value("filter", "none hue-rotate(0deg)");
+
+test_invalid_value("filter", "blur(10)");
+test_invalid_value("filter", "blur(-100px)");
+test_invalid_value("filter", "blur()"); // crbug.com/618960 Blink/WebKit accept no arguments for all but drop-shadow.
+
+test_invalid_value("filter", "brightness(-20)"); // crbug.com/776208 Blink/WebKit accept negative brightness.
+test_invalid_value("filter", "brightness(30px)");
+test_invalid_value("filter", "brightness()");
+
+test_invalid_value("filter", "contrast(-20)");
+test_invalid_value("filter", "contrast(30px)");
+test_invalid_value("filter", "contrast()");
+
+test_invalid_value("filter", "drop-shadow(10 20)");
+test_invalid_value("filter", "drop-shadow(10% 20%)");
+test_invalid_value("filter", "drop-shadow(1px)");
+test_invalid_value("filter", "drop-shadow(1px 2px 3px 4px)");
+test_invalid_value("filter", "drop-shadow(rgb(4, 5, 6))");
+// https://github.com/w3c/fxtf-drafts/issues/231
+test_invalid_value("filter", "drop-shadow(rgb(4, 5, 6) 1px 2px)"); // Fails in Blink/WebKit "drop-shadow(rgb(4, 5, 6) 1px 2px)" and Firefox "drop-shadow(1px 2px rgb(4, 5, 6))".
+test_invalid_value("filter", "drop-shadow()");
+
+test_invalid_value("filter", "grayscale(-20)");
+test_invalid_value("filter", "grayscale(30px)");
+test_invalid_value("filter", "grayscale()");
+
+test_invalid_value("filter", "hue-rotate(90)");
+test_invalid_value("filter", "hue-rotate()");
+
+test_invalid_value("filter", "invert(-20)");
+test_invalid_value("filter", "invert(30px)");
+test_invalid_value("filter", "invert()");
+
+test_invalid_value("filter", "opacity(-20)");
+test_invalid_value("filter", "opacity(30px)");
+test_invalid_value("filter", "opacity()");
+
+test_invalid_value("filter", "saturate(-20)");
+test_invalid_value("filter", "saturate(30px)");
+test_invalid_value("filter", "saturate()");
+
+test_invalid_value("filter", "sepia(-20)");
+test_invalid_value("filter", "sepia(30px)");
+test_invalid_value("filter", "sepia()");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/filter-parsing-valid.html b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/filter-parsing-valid.html
new file mode 100644
index 0000000000000..d7e0af4a78a66
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/filter-parsing-valid.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Filter Effects Module Level 1: parsing filter with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#FilterProperty">
+<meta name="assert" content="filter supports the full grammar 'none | <filter-function-list>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("filter", "none");
+
+test_valid_value("filter", "blur(100px)");
+test_valid_value("filter", "blur(0)", "blur(0px)");
+
+test_valid_value("filter", "brightness(0)");
+test_valid_value("filter", "brightness(300%)");
+
+test_valid_value("filter", "contrast(0)");
+test_valid_value("filter", "contrast(300%)");
+
+test_valid_value("filter", "drop-shadow(1px 2px)");
+test_valid_value("filter", "drop-shadow(1px 2px 3px)");
+test_valid_value("filter", "drop-shadow(0 0 0)", "drop-shadow(0px 0px 0px)");
+// https://github.com/w3c/fxtf-drafts/issues/231
+test_valid_value("filter", "drop-shadow(1px 2px rgb(4, 5, 6))"); // Blink/WebKit serialize as "drop-shadow(rgb(4, 5, 6) 1px 2px)"
+test_valid_value("filter", "drop-shadow(1px 2px 3px rgba(4, 5, 6, 0.75))"); // Blink/WebKit serialize as "drop-shadow(rgba(4, 5, 6, 0.75) 1px 2px 3px)"
+
+test_valid_value("filter", "grayscale(0)");
+test_valid_value("filter", "grayscale(300%)", "grayscale(100%)");
+
+test_valid_value("filter", "hue-rotate(90deg)");
+test_valid_value("filter", "hue-rotate(0)", "hue-rotate(0deg)"); // https://github.com/w3c/fxtf-drafts/issues/228
+
+test_valid_value("filter", "invert(0)");
+test_valid_value("filter", "invert(300%)", "invert(100%)");
+
+test_valid_value("filter", "opacity(0)");
+test_valid_value("filter", "opacity(300%)", "opacity(100%)");
+
+test_valid_value("filter", "saturate(0)");
+test_valid_value("filter", "saturate(300%)");
+
+test_valid_value("filter", "sepia(0)");
+test_valid_value("filter", "sepia(300%)", "sepia(100%)");
+
+// Edge serializes url(...) without quotes. Blink/WebKit and Firefox use quotes.
+test_valid_value("filter", "url(picture.svg#f)", ['url("picture.svg#f")', 'url(picture.svg#f)']);
+
+test_valid_value("filter", 'url("https://www.example.com/picture.svg#f")',
+  ['url("https://www.example.com/picture.svg#f")', 'url(https://www.example.com/picture.svg#f)']);
+
+test_valid_value("filter", 'blur(10px) url("picture.svg#f") contrast(20) brightness(30)',
+  ['blur(10px) url("picture.svg#f") contrast(20) brightness(30)', 'blur(10px) url(picture.svg#f) contrast(20) brightness(30)']);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/lighting-color-parsing-invalid.html b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/lighting-color-parsing-invalid.html
new file mode 100644
index 0000000000000..b74888ee9f8b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/lighting-color-parsing-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Filter Effects Module Level 1: parsing lighting-color with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#LightingColorProperty">
+<meta name="assert" content="lighting-color supports only the grammar 'auto | sRGB | linearRGB'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("lighting-color", "auto");
+test_invalid_value("lighting-color", "none");
+test_invalid_value("lighting-color", "#a");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/lighting-color-parsing-valid.html b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/lighting-color-parsing-valid.html
new file mode 100644
index 0000000000000..2dd316327a88c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/lighting-color-parsing-valid.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Filter Effects Module Level 1: parsing lighting-color with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#LightingColorProperty">
+<meta name="assert" content="lighting-color supports the full grammar 'auto | sRGB | linearRGB'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("lighting-color", "rgb(1,2,3)", "rgb(1, 2, 3)");
+test_valid_value("lighting-color", "#102030", "rgb(16, 32, 48)");
+test_valid_value("lighting-color", "rgba(1, 2, 3, 0.5)");
+
+// Edge serializes this keyword as mixed case. Blink, WebKit, Firefox serialize as lowercase.
+test_valid_value("lighting-color", "currentColor", ["currentColor", "currentcolor"]);
+test_valid_value("lighting-color", "currentcolor", ["currentColor", "currentcolor"]);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/resources/parsing-testcommon.js b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/resources/parsing-testcommon.js
new file mode 100644
index 0000000000000..70a1c38fb38c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects-1/parsing/resources/parsing-testcommon.js
@@ -0,0 +1,37 @@
+'use strict';
+
+function test_valid_value(property, value, serializedValue) {
+    if (arguments.length < 3)
+        serializedValue = value;
+
+    var stringifiedValue = JSON.stringify(value);
+
+    test(function(){
+        var div = document.createElement('div');
+        div.style[property] = value;
+        assert_not_equals(div.style[property], "");
+    }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
+
+    test(function(){
+        var div = document.createElement('div');
+        div.style[property] = value;
+        var readValue = div.style[property];
+
+        if (Array.isArray(serializedValue))
+            assert_true(serializedValue.indexOf(readValue) >= 0, '"' + readValue + '" in ' + JSON.stringify(serializedValue));
+        else
+            assert_equals(readValue, serializedValue);
+        div.style[property] = readValue;
+        assert_equals(div.style[property], readValue);
+    }, "Serialization should round-trip after setting e.style['" + property + "'] = " + stringifiedValue);
+}
+
+function test_invalid_value(property, value) {
+    var stringifiedValue = JSON.stringify(value);
+
+    test(function(){
+        var div = document.createElement('div');
+        div.style[property] = value;
+        assert_equals(div.style[property], "");
+    }, "e.style['" + property + "'] = " + stringifiedValue + " should not set the property value");
+}
diff --git a/tests/wpt/web-platform-tests/cssom-view/scrollBoundaryBehavior-manual.html b/tests/wpt/web-platform-tests/cssom-view/overscrollBehavior-manual.html
similarity index 79%
rename from tests/wpt/web-platform-tests/cssom-view/scrollBoundaryBehavior-manual.html
rename to tests/wpt/web-platform-tests/cssom-view/overscrollBehavior-manual.html
index efd00437bde01..b37c4dc770c8a 100644
--- a/tests/wpt/web-platform-tests/cssom-view/scrollBoundaryBehavior-manual.html
+++ b/tests/wpt/web-platform-tests/cssom-view/overscrollBehavior-manual.html
@@ -41,8 +41,8 @@
   </div>
 </div>
 <input type="button" id="btnDone" value="DONE" style="width: 100px; height: 50px;"/>
-<h1>scroll-boundary-behavior</h1>
-<h4>Tests that scroll-boundary-behavior prevents scroll-propagation in the area and direction as specified.</h4>
+<h1>overscroll-behavior</h1>
+<h4>Tests that overscroll-behavior prevents scroll-propagation in the area and direction as specified.</h4>
 <ol>
   <li id="i1">Make two scrolls on <span style="color: blue">BLUE</span>, in this order: scroll UP (or drag down), then scroll LEFT (or drag right). Scroll (or drag) until nothing is scrolling. Then tap on DONE.</li>
   <li id="i2">Repeat the same scrolls as in step 1 and then tap on DONE.</li>
@@ -55,7 +55,7 @@ <h4>Tests that scroll-boundary-behavior prevents scroll-propagation in the area
 const container = document.getElementById('container');
 const non_scrollable = document.getElementById('non_scrollable');
 const root = document.getElementById('root');
-var test = async_test("scroll-boundary-behavior prevents scroll-propagation in the area and direction as specified");
+var test = async_test("overscroll-behavior prevents scroll-propagation in the area and direction as specified");
 var instruction1 = document.getElementById("i1");
 var instruction2 = document.getElementById("i2");
 var instruction3 = document.getElementById("i3");
@@ -74,8 +74,8 @@ <h4>Tests that scroll-boundary-behavior prevents scroll-propagation in the area
 function set_boundary_prevents_y() {
   instruction1.style.color = 'red';
   instruction1.style.fontWeight = 'bold';
-  container.style.scrollBoundaryBehaviorX = 'auto';
-  container.style.scrollBoundaryBehaviorY = 'none';
+  container.style.overscrollBehaviorX = 'auto';
+  container.style.overscrollBehaviorY = 'none';
   setUpForRoot(100);
   setUpForContainer(0);
 }
@@ -86,10 +86,10 @@ <h4>Tests that scroll-boundary-behavior prevents scroll-propagation in the area
   test.step(function() {
     assert_equals(root.scrollTop, 100);
     assert_equals(root.scrollLeft, 0);
-  }, "scroll-boundary-behavior-y: none should only prevent scroll propagation on y axis.");
+  }, "overscroll-behavior-y: none should only prevent scroll propagation on y axis.");
 
-  container.style.scrollBoundaryBehaviorX = 'none';
-  container.style.scrollBoundaryBehaviorY = 'auto';
+  container.style.overscrollBehaviorX = 'none';
+  container.style.overscrollBehaviorY = 'auto';
   setUpForRoot(100);
   setUpForContainer(0);
 }
@@ -100,10 +100,10 @@ <h4>Tests that scroll-boundary-behavior prevents scroll-propagation in the area
   test.step(function() {
     assert_equals(root.scrollTop, 0);
     assert_equals(root.scrollLeft, 100);
-  }, "scroll-boundary-behavior-x: none should only prevent scroll propagation on x axis.");
+  }, "overscroll-behavior-x: none should only prevent scroll propagation on x axis.");
 
-  container.style.scrollBoundaryBehaviorX = 'none';
-  container.style.scrollBoundaryBehaviorY = 'none';
+  container.style.overscrollBehaviorX = 'none';
+  container.style.overscrollBehaviorY = 'none';
   setUpForRoot(100);
   setUpForContainer(100);
 }
@@ -118,10 +118,10 @@ <h4>Tests that scroll-boundary-behavior prevents scroll-propagation in the area
     assert_equals(container.scrollLeft, 0);
     assert_equals(root.scrollTop, 100);
     assert_equals(root.scrollLeft, 100);
-  }, "scroll-boundary-behavior should latch the scroll to the inner container.");
+  }, "overscroll-behavior should latch the scroll to the inner container.");
 
-  non_scrollable.style.scrollBoundaryBehaviorX = 'none';
-  non_scrollable.style.scrollBoundaryBehaviorY = 'none';
+  non_scrollable.style.overscrollBehaviorX = 'none';
+  non_scrollable.style.overscrollBehaviorY = 'none';
   setUpForRoot(100);
 }
 
@@ -129,7 +129,7 @@ <h4>Tests that scroll-boundary-behavior prevents scroll-propagation in the area
   test.step(function() {
     assert_equals(root.scrollLeft, 0);
     assert_equals(root.scrollTop, 0);
-  }, "scroll-boundary-behavior on non-scrollable area should not affect scroll propagation.");
+  }, "overscroll-behavior on non-scrollable area should not affect scroll propagation.");
   test.done();
 }
 
diff --git a/tests/wpt/web-platform-tests/encrypted-media/encrypted-media-default-feature-policy.https.sub.html b/tests/wpt/web-platform-tests/encrypted-media/encrypted-media-default-feature-policy.https.sub.html
index 1514d306f30e3..e1ad3c5881bd4 100644
--- a/tests/wpt/web-platform-tests/encrypted-media/encrypted-media-default-feature-policy.https.sub.html
+++ b/tests/wpt/web-platform-tests/encrypted-media/encrypted-media-default-feature-policy.https.sub.html
@@ -9,7 +9,7 @@
   run_all_fp_tests_allow_self(
       'https://{{domains[www]}}:{{ports[https][0]}}',
       'encrypted-media',
-      'NotSupportedError: requestMediaKeySystemAccess is disabled by feature ' +
+      'SecurityError: requestMediaKeySystemAccess is disabled by feature ' +
       'policy.',
       function() {
         return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{
diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/keepalive.html b/tests/wpt/web-platform-tests/fetch/api/basic/keepalive.html
new file mode 100644
index 0000000000000..5316410004a78
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/basic/keepalive.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>Fetch API: keepalive handling</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<body>
+<script>
+const host_info = get_host_info();
+promise_test(async (test) => {
+  const iframe = document.createElement('iframe');
+  iframe.src = host_info.HTTP_REMOTE_ORIGIN +
+    '/fetch/api/resources/keepalive-iframe.html';
+  document.body.appendChild(iframe);
+  const uuid_promise = new Promise((resolve) => {
+    window.addEventListener('message', (event) => {
+      resolve(event.data);
+    });
+  });
+  await (new Promise((resolve) => iframe.addEventListener('load', resolve)));
+  const uuid = await uuid_promise;
+  iframe.remove();
+  await (new Promise((resolve) => test.step_timeout(resolve, 1000)));
+  const response = await fetch(`../resources/stash-take.py?key=${uuid}`);
+  const json = await response.json();
+  assert_equals(json, 'on');
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.html b/tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.html
new file mode 100644
index 0000000000000..c9e1a6acdd30a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Request keepalive</title>
+<meta name="help" href="https://fetch.spec.whatwg.org/#request">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+</head>
+<body>
+<script>
+test(() => {
+  assert_false(new Request('/').keepalive, 'default');
+  assert_true(new Request('/', {keepalive: true}).keepalive, 'true');
+  assert_false(new Request('/', {keepalive: false}).keepalive, 'false');
+  assert_true(new Request('/', {keepalive: 1}).keepalive, 'truish');
+  assert_false(new Request('/', {keepalive: 0}).keepalive, 'falsy');
+}, 'keepalive flag');
+
+test(() => {
+  const init = {method: 'POST', keepalive: true, body: new ReadableStream()};
+  assert_throws('TypeError', () => {new Request('/', init)});
+}, 'keepalive flag with stream body');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/keepalive-iframe.html b/tests/wpt/web-platform-tests/fetch/api/resources/keepalive-iframe.html
new file mode 100644
index 0000000000000..742309ab4d238
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/resources/keepalive-iframe.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<script src="/common/utils.js"></script>
+<script>
+const uuid = token();
+const URL =
+    `../resources/redirect.py?` +
+    `delay=100&` +
+    `location=../resources/stash-put.py?key=${uuid}%26value=on`;
+
+addEventListener('load', () => {
+  let p = fetch(URL, {keepalive: true});
+  window.parent.postMessage(uuid, '*');
+});
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/redirect.py b/tests/wpt/web-platform-tests/fetch/api/resources/redirect.py
index 5184be1f611f3..3d313e5b0b40e 100644
--- a/tests/wpt/web-platform-tests/fetch/api/resources/redirect.py
+++ b/tests/wpt/web-platform-tests/fetch/api/resources/redirect.py
@@ -1,5 +1,6 @@
 from urllib import urlencode
 from urlparse import urlparse
+import time
 
 def main(request, response):
     stashed_data = {'count': 0, 'preflight': "0"}
@@ -48,6 +49,9 @@ def main(request, response):
     if "redirect_referrerpolicy" in request.GET:
         headers.append(("Referrer-Policy", request.GET['redirect_referrerpolicy']))
 
+    if "delay" in request.GET:
+        time.sleep(float(request.GET.first("delay", 0)) / 1E3)
+
     if token:
         request.server.stash.put(request.GET.first("token"), stashed_data)
         if "max_count" in request.GET:
diff --git a/tests/wpt/web-platform-tests/generic-sensor/SensorErrorEvent-constructor.html b/tests/wpt/web-platform-tests/generic-sensor/SensorErrorEvent-constructor.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/generic-sensor/SensorErrorEvent-constructor.html
rename to tests/wpt/web-platform-tests/generic-sensor/SensorErrorEvent-constructor.https.html
diff --git a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js
index b06716346227a..aa9a252275232 100644
--- a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js
+++ b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js
@@ -40,8 +40,10 @@ function runGenericSensorTests(sensorType) {
     let sensor = new sensorType();
     sensor.onreading = t.step_func_done(() => {
       assert_reading_not_null(sensor);
+      assert_true(sensor.hasReading);
       sensor.stop();
       assert_reading_null(sensor);
+      assert_false(sensor.hasReading);
     });
     sensor.onerror = t.step_func_done(unreached);
     sensor.start();
@@ -192,8 +194,8 @@ function runGenericSensorTests(sensorType) {
 
 function runGenericSensorInsecureContext(sensorType) {
   test(() => {
-    assert_throws('SecurityError', () => { new sensorType(); });
-  }, `${sensorType.name}: throw a 'SecurityError' when construct sensor in an insecure context`);
+    assert_false(sensorType in window, `${sensorType} must not be exposed`);
+  }, `${sensorType} is not exposed in an insecure context`);
 }
 
 function runGenericSensorOnerror(sensorType) {
diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope_insecure_context.html b/tests/wpt/web-platform-tests/gyroscope/Gyroscope_insecure_context.html
index f772b0a254050..2ae8117d70877 100644
--- a/tests/wpt/web-platform-tests/gyroscope/Gyroscope_insecure_context.html
+++ b/tests/wpt/web-platform-tests/gyroscope/Gyroscope_insecure_context.html
@@ -15,6 +15,6 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorInsecureContext(Gyroscope);
+runGenericSensorInsecureContext("Gyroscope");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/gyroscope/idlharness.https.html b/tests/wpt/web-platform-tests/gyroscope/idlharness.https.html
index ca8f69d94d5e9..d6911988cb71c 100644
--- a/tests/wpt/web-platform-tests/gyroscope/idlharness.https.html
+++ b/tests/wpt/web-platform-tests/gyroscope/idlharness.https.html
@@ -24,6 +24,7 @@
 [SecureContext, Exposed=Window]
 interface Sensor : EventTarget {
   readonly attribute boolean activated;
+  readonly attribute boolean hasReading;
   readonly attribute DOMHighResTimeStamp? timestamp;
   void start();
   void stop();
@@ -34,9 +35,9 @@
 
 [Constructor(optional SensorOptions sensorOptions), Exposed=Window]
 interface Gyroscope : Sensor {
-  readonly attribute unrestricted double? x;
-  readonly attribute unrestricted double? y;
-  readonly attribute unrestricted double? z;
+  readonly attribute double? x;
+  readonly attribute double? y;
+  readonly attribute double? z;
 };
 </script>
 
diff --git a/tests/wpt/web-platform-tests/html/dom/elements-embedded.js b/tests/wpt/web-platform-tests/html/dom/elements-embedded.js
index 64e7416cb94e4..176da29d4f668 100644
--- a/tests/wpt/web-platform-tests/html/dom/elements-embedded.js
+++ b/tests/wpt/web-platform-tests/html/dom/elements-embedded.js
@@ -33,6 +33,7 @@ var embeddedElements = {
     width: "string",
     height: "string",
     referrerPolicy: {type: "enum", keywords: ["", "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "strict-origin", "origin-when-cross-origin", "strict-origin-when-cross-origin", "unsafe-url"]},
+    delegateStickyUserActivation: {type: "enum", keywords: ["vibration", "media"], defaultVal: null},
 
     // Obsolete
     align: "string",
diff --git a/tests/wpt/web-platform-tests/html/editing/focus/processing-model/preventScroll.html b/tests/wpt/web-platform-tests/html/editing/focus/processing-model/preventScroll.html
new file mode 100644
index 0000000000000..fda9480e8b975
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/editing/focus/processing-model/preventScroll.html
@@ -0,0 +1,75 @@
+<!doctype html>
+<title>focus(options) - preventScroll</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<style>
+#iframe { width: 500px; height: 500px; border: none }
+</style>
+<iframe id=iframe src="support/preventScroll-helper.html"></iframe>
+<script>
+function isEntirelyInView(elm, win) {
+  const inViewHorizontal = (elm.offsetLeft >= win.scrollX) &&
+                           ((elm.offsetLeft + elm.clientWidth) <= (win.scrollX + win.innerWidth));
+  const inViewVertical = (elm.offsetTop >= win.scrollY) &&
+                         ((elm.offsetTop + elm.clientHeight) <= (win.scrollY + win.innerHeight));
+  return inViewHorizontal && inViewVertical;
+}
+
+setup({explicit_done: true});
+
+function resetState(win) {
+  win.scrollTo(0, 0);
+  win.document.activeElement.blur();
+}
+
+onload = () => {
+  const win = document.getElementById('iframe').contentWindow;
+  const elm = win.document.getElementById('button');
+
+  test(() => {
+    assert_false(isEntirelyInView(elm, win), 'initial state');
+    elm.scrollIntoView();
+    assert_true(isEntirelyInView(elm, win), 'after elm.scrollIntoView()');
+    resetState(win);
+    assert_false(isEntirelyInView(elm, win), 'after resetScrollPosition(win)');
+  }, 'Sanity test');
+
+  test(() => {
+    resetState(win);
+    elm.focus();
+    assert_true(isEntirelyInView(elm, win));
+  }, 'elm.focus() without arguments');
+
+  test(() => {
+    resetState(win);
+    elm.focus(undefined);
+    assert_true(isEntirelyInView(elm, win));
+  }, 'elm.focus(undefined)');
+
+  test(() => {
+    resetState(win);
+    elm.focus(null);
+    assert_true(isEntirelyInView(elm, win));
+  }, 'elm.focus(null)');
+
+  test(() => {
+    resetState(win);
+    elm.focus({});
+    assert_true(isEntirelyInView(elm, win));
+  }, 'elm.focus({})');
+
+  test(() => {
+    resetState(win);
+    elm.focus({preventScroll: false});
+    assert_true(isEntirelyInView(elm, win));
+  }, 'elm.focus({preventScroll: false})');
+
+  test(() => {
+    resetState(win);
+    elm.focus({preventScroll: true});
+    assert_false(isEntirelyInView(elm, win));
+  }, 'elm.focus({preventScroll: true})');
+
+  done();
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/html/editing/focus/processing-model/support/preventScroll-helper.html b/tests/wpt/web-platform-tests/html/editing/focus/processing-model/support/preventScroll-helper.html
new file mode 100644
index 0000000000000..43c6d86a578be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/editing/focus/processing-model/support/preventScroll-helper.html
@@ -0,0 +1,6 @@
+<!doctype html>
+<title>Helper document for preventScroll test</title>
+<style>
+body { padding: 2000px }
+</style>
+<button id=button>X</button>
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
index 907b5fb1a502b..769b41bcc27fe 100644
--- a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
+++ b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
@@ -35,7 +35,7 @@ onload = function() {
                       // page and the test timing out
                       test_obj.force_timeout();
                   }
-                  setTimeout(poll, 200);
+                  step_timeout(poll, 200);
               } else {
                   assert_equals(xhr.response, expected);
                   test_obj.done();
@@ -43,7 +43,7 @@ onload = function() {
           });
           xhr.send();
       })
-      setTimeout(poll, 200);
+      step_timeout(poll, 200);
   }
 
   // background attribute, check with getComputedStyle
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html
new file mode 100644
index 0000000000000..87a130c6f0178
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<dialog></dialog>
+<script>
+test(function() {
+  dialog = document.querySelector('dialog')
+  assert_true(dialog instanceof HTMLDialogElement);
+}, "The DIALOG element should be recognized");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html
new file mode 100644
index 0000000000000..2a80de65a15a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<dialog></dialog>
+<script>
+test(function() {
+    dialog = document.querySelector('dialog');
+    assert_equals(dialog.returnValue, '');
+
+    dialog.returnValue = 'Setting value directly';
+    assert_equals(dialog.returnValue, 'Setting value directly');
+
+    dialog.returnValue = null;
+    assert_equals(dialog.returnValue, 'null');
+
+    dialog.returnValue = '';
+    assert_equals(dialog.returnValue, '');
+
+    dialog.returnValue = 7;
+    assert_equals(dialog.returnValue, '7');
+
+    dialog.show();
+    dialog.close('Return value set from close()');
+    assert_equals(dialog.returnValue, 'Return value set from close()');
+
+    dialog.show();
+    dialog.close('');
+    assert_equals(dialog.returnValue, '');
+
+    dialog.show();
+    dialog.close(null);
+    assert_equals(dialog.returnValue, 'null');
+
+    dialog.returnValue = 'Should not change because no argument to close()';
+    dialog.show();
+    dialog.close();
+    assert_equals(dialog.returnValue, 'Should not change because no argument to close()');
+
+    dialog.returnValue = 'Should not change because of undefined argument to close()';
+    dialog.show();
+    dialog.close(undefined);
+    assert_equals(dialog.returnValue, 'Should not change because of undefined argument to close()');
+
+    dialog.returnValue = 'Should not change because of no-op close()';
+    dialog.close('blah');
+    assert_equals(dialog.returnValue, 'Should not change because of no-op close()');
+}, "Tests dialog.returnValue is settable and returns the last value set.");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html
new file mode 100644
index 0000000000000..164b41459d176
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/common.js"></script>
+<script>
+promise_test(() => {
+  return waitUntilLoadedAndAutofocused().then(() => {
+        outerButton = document.getElementById('outer-button');
+        assert_equals(document.activeElement, outerButton);
+
+        // Test that focus goes to body if the dialog has no focusable elements, including itself
+        var outerDialog = document.getElementById('outer-dialog');
+        outerDialog.showModal();
+        assert_equals(document.activeElement, document.body);
+
+        // Test that an autofocus element in the dialog gets focus.
+        var dialog = document.getElementById('dialog');
+        dialog.showModal();
+        autofocusButton = document.getElementById('autofocus-button');
+        assert_equals(document.activeElement, autofocusButton);
+        dialog.close();
+
+        // ... or else first focusable element in the dialog gets focus.
+        autofocusButton.parentNode.removeChild(autofocusButton);
+        dialog.showModal();
+        firstButton = document.getElementById('first-button');
+        assert_equals(document.activeElement, firstButton);
+        dialog.close();
+
+        // ... or else the dialog itself gets focus.;
+        var buttons = dialog.querySelectorAll('button');
+        for (var i = 0; i < buttons.length; ++i)
+            buttons[i].hidden = true;
+        dialog.showModal();
+        assert_equals(document.activeElement, dialog);
+        dialog.close();
+
+        document.getElementById('outer-dialog').close();
+  });
+}, "focus when a modal dialog is opened");
+</script>
+</head>
+<body>
+<button id="outer-button" autofocus></button>
+<dialog id="outer-dialog">
+    <dialog id="dialog" tabindex=0>
+        <button disabled></button>
+        <dialog>
+            <button autofocus></button>
+        </dialog>
+        <button id="first-button"></button>
+        <div>
+            <span>
+                <button id="autofocus-button" autofocus></button>
+            </span>
+        </div>
+        <button id="final-button"></button>
+    </dialog>
+</dialog>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html
deleted file mode 100644
index 3a04395678f9a..0000000000000
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-error.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<title>Basic dynamic imports</title>
-<link rel="author" title="Kouhei Ueno" href="mailto:kouhei@chromium.org">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script type="module">
-promise_test(t => {
-  return promise_rejects(t, new SyntaxError, import("../syntaxerror.js"));
-}, "Dynamic imports should reject if the imported tree has a syntax error.");
-promise_test(t => {
-  return promise_rejects(t, new SyntaxError, import("../instantiation-error-1.js"));
-}, "Dynamic imports should reject if the imported tree has an instantiation error.");
-promise_test(t => {
-  return promise_rejects(t, new Error, import("../throw-error.js")).then(() => {
-    assert_true(window.before_throwing_error,
-        "the module script should run to a point where it throws exception");
-    assert_equals(undefined, window.after_throwing_error,
-        "the module script should not run after it throws exception");
-  });
-}, "Dynamic imports should reject if the imported tree has an evaluation error.");
-</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html
new file mode 100644
index 0000000000000..5cc600c5a3db0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<title>import(): error cases occuring during fetching</title>
+<link rel="author" title="Domenic Denicola" href="mailto:d@domenic.me">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script type="module">
+const cases = [
+  ["wrong MIME type", "../errorhandling-wrongMimetype.js?pipe=header(Content-Type,text/plain)"],
+  ["wrong MIME type of a dependency", "../errorhandling-wrongMimetype-import.js"],
+  ["404", "../resources/404-but-js.asis"],
+  ["404 of a dependency", "../resources/imports-404-but-js.js"],
+  ["500", "../resources/500-but-js.asis"],
+  ["500 of a dependency", "../resources/imports-500-but-js.js"],
+  ["cross-origin module (without CORS)", "http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/imports-a.js"],
+  ["cross-origin module dependency (without CORS)", "../resources/imports-b-cross-origin.sub.js"]
+];
+
+for (const [label, specifier] of cases) {
+  promise_test(t => {
+    return promise_rejects(t, new TypeError, import(specifier));
+  }, "import() must reject when there is a " + label);
+
+  promise_test(async t => {
+    // The use of ?x is used to separate tests so they don't interfere with each other.
+    // (However, it shouldn't matter anyway, in a spec-compliant implementation.)
+    const suffix = (specifier.includes("?") ? "&" : "?") + "x";
+    const promise1 = import(specifier + suffix);
+    const promise2 = import(specifier + suffix);
+
+    await promise_rejects(t, new TypeError, promise1, "It must reject the first time");
+    await promise_rejects(t, new TypeError, promise2, "It must reject the second time");
+
+    const error1 = await promise1.catch(e => e);
+    const error2 = await promise2.catch(e => e);
+
+    assert_not_equals(error1, error2, "The error objects must be different");
+  }, "import() must reject with a different error object for each import when there is a " + label);
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html
new file mode 100644
index 0000000000000..9390ce0a7a85d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<title>import(): error cases caused by the imported module script</title>
+<link rel="author" title="Kouhei Ueno" href="mailto:kouhei@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script type="module">
+const cases = [
+  ["parse error", "../syntaxerror.js", new SyntaxError],
+  ["bad module specifier", "does-not-start-with-dot.js", new TypeError, { differentErrorObjects: true }],
+  ["bad module specifier in a dependency", "../bad-module-specifier.js", new TypeError],
+  ["instantiation error", "../instantiation-error-1.js", new SyntaxError],
+  ["evaluation error", "../throw-error.js", new Error]
+];
+
+for (const [label, specifier, error, { differentErrorObjects } = {}] of cases) {
+  promise_test(t => {
+    return promise_rejects(t, error, import(specifier));
+  }, "import() must reject when there is a " + label);
+
+  const errorObjectsLabel = differentErrorObjects ? "different error objects" : "the same error object";
+  promise_test(async t => {
+    // The use of ?x is used to separate tests so they don't interfere with each other.
+    // (However, it shouldn't matter anyway, in a spec-compliant implementation.)
+    const promise1 = import(specifier + "?x");
+    const promise2 = import(specifier + "?x");
+
+    await promise_rejects(t, error, promise1, "It must reject the first time");
+    await promise_rejects(t, error, promise2, "It must reject the second time");
+
+    const error1 = await promise1.catch(e => e);
+    const error2 = await promise2.catch(e => e);
+
+    if (differentErrorObjects) {
+      assert_not_equals(error1, error2, "The error objects must be different");
+    } else {
+      assert_equals(error1, error2, "The error objects must be equal");
+    }
+  }, `import() must reject with ${errorObjectsLabel} for each import when there is a ${label}`);
+}
+
+promise_test(t => {
+  delete window.before_throwing_error;
+  delete window.after_throwing_error;
+
+  return promise_rejects(t, new Error, import("../throw-error.js?y")).then(() => {
+    assert_true(window.before_throwing_error,
+        "the module script should run to a point where it throws exception");
+    assert_equals(window.after_throwing_error, undefined,
+        "the module script should not run after it throws exception");
+  });
+}, "import()ing a module with an evaluation error must stop evaluation");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype-import.js b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype-import.js
index 5e7b21b3214e7..286e1a422981d 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype-import.js
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype-import.js
@@ -1,4 +1,4 @@
-import foo from "./errorhandling-wrongMimetype.js?pipe=header(X-Content-Type-Options,nosniff),header(Content-Type,text/plain)";
+import foo from "./errorhandling-wrongMimetype.js?pipe=header(Content-Type,text/plain)";
 
 // We don't expect this code to run, the import above should fail!
 // If we do run though, don't trigger an error that the testharness
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html
index 5315df0f5b262..cf47465b494fd 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html
@@ -35,7 +35,7 @@ <h1>html-script-module-errorHandling</h1>
         var test_wrongMimetype_root = async_test("External root module with non-script mimetype");
         var script_wrongMimetype_root = document.createElement("script");
         script_wrongMimetype_root.type = "module";
-        script_wrongMimetype_root.src = "errorhandling-wrongMimetype.js?pipe=header(Content-Type,text/plain),header(X-Content-Type-Options,nosniff)";
+        script_wrongMimetype_root.src = "errorhandling-wrongMimetype.js?pipe=header(Content-Type,text/plain)";
         script_wrongMimetype_root.addEventListener("error", test_wrongMimetype_root.step_func(function () {
             test_wrongMimetype_root.done();
         }));
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-dependent.js b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-dependent.js
new file mode 100644
index 0000000000000..cfaeabc47e1dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-dependent.js
@@ -0,0 +1 @@
+export let importMetaOnDependentModule = import.meta;
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-root.js b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-root.js
new file mode 100644
index 0000000000000..62ec082a8ef13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-root.js
@@ -0,0 +1,2 @@
+export let importMetaOnRootModule = import.meta;
+export { importMetaOnDependentModule } from "./import-meta-dependent.js";
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html
new file mode 100644
index 0000000000000..3c853b22d6e87
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script type="module">
+import { importMetaOnRootModule, importMetaOnDependentModule }
+    from "./import-meta-root.js";
+
+var base = location.href.slice(0, location.href.lastIndexOf('/'));
+
+test(() => {
+  assert_equals(import.meta.url, location.href);
+}, "import.meta.url in a root inline script");
+
+test(() => {
+  assert_equals(importMetaOnRootModule.url,
+                base + "/import-meta-root.js");
+}, "import.meta.url in a root external script");
+
+test(() => {
+  assert_equals(importMetaOnDependentModule.url,
+                base + "/import-meta-dependent.js");
+}, "import.meta.url in a dependent external script");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis
new file mode 100644
index 0000000000000..0fe1379e5692d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis
@@ -0,0 +1,4 @@
+HTTP/1.1 404 Not Found
+Content-Type: text/javascript
+
+window.ran404 = true;
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/500-but-js.asis b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/500-but-js.asis
new file mode 100644
index 0000000000000..c81202f7ef0a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/500-but-js.asis
@@ -0,0 +1,4 @@
+HTTP/1.1 500 Not Found
+Content-Type: text/javascript
+
+window.ran500 = true;
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-404-but-js.js b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-404-but-js.js
new file mode 100644
index 0000000000000..d62e4f05bec96
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-404-but-js.js
@@ -0,0 +1 @@
+import "./404-but-js.asis";
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-500-but-js.js b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-500-but-js.js
new file mode 100644
index 0000000000000..d62e4f05bec96
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-500-but-js.js
@@ -0,0 +1 @@
+import "./404-but-js.asis";
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-b-cross-origin.sub.js b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-b-cross-origin.sub.js
new file mode 100644
index 0000000000000..6db57b5017dcf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-b-cross-origin.sub.js
@@ -0,0 +1 @@
+import "http://{{domains[www2]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/imports-b.js";
diff --git a/tests/wpt/web-platform-tests/interfaces/ambient-light.idl b/tests/wpt/web-platform-tests/interfaces/ambient-light.idl
new file mode 100644
index 0000000000000..0bdc9cb9e3ba4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/interfaces/ambient-light.idl
@@ -0,0 +1,4 @@
+[Constructor(optional SensorOptions sensorOptions), SecureContext, Exposed=Window]
+interface AmbientLightSensor : Sensor {
+  readonly attribute double? illuminance;
+};
diff --git a/tests/wpt/web-platform-tests/interfaces/cssom-view.idl b/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
index af779a1cc4af4..4a70cb9979597 100644
--- a/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
@@ -89,15 +89,14 @@ interface CaretPosition {
 
 enum ScrollLogicalPosition { "start", "center", "end", "nearest" };
 dictionary ScrollIntoViewOptions : ScrollOptions {
-  ScrollLogicalPosition block = "center";
-  ScrollLogicalPosition inline = "center";
+  ScrollLogicalPosition block = "start";
+  ScrollLogicalPosition inline = "nearest";
 };
 
 partial interface Element {
   DOMRectList getClientRects();
   [NewObject] DOMRect getBoundingClientRect();
-  void scrollIntoView();
-  void scrollIntoView((boolean or object) arg);
+  void scrollIntoView(optional (boolean or ScrollIntoViewOptions) arg);
   void scroll(optional ScrollToOptions options);
   void scroll(unrestricted double x, unrestricted double y);
   void scrollTo(optional ScrollToOptions options);
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index a372298d7c026..a8693340e9ac9 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -1,4 +1,5 @@
-[LegacyUnenumerableNamedProperties]
+[Exposed=Window,
+ LegacyUnenumerableNamedProperties]
 interface HTMLAllCollection {
   readonly attribute unsigned long length;
   getter Element? (unsigned long index);
@@ -6,6 +7,7 @@ interface HTMLAllCollection {
   legacycaller (HTMLCollection or Element)? item(optional DOMString nameOrIndex);
 };
 
+[Exposed=Window]
 interface HTMLFormControlsCollection : HTMLCollection {
   // inherits length and item()
   getter (RadioNodeList or Element)? namedItem(DOMString name); // shadows inherited namedItem()
@@ -15,6 +17,7 @@ interface RadioNodeList : NodeList {
   attribute DOMString value;
 };
 
+[Exposed=Window]
 interface HTMLOptionsCollection : HTMLCollection {
   // inherits item(), namedItem()
   [CEReactions] attribute unsigned long length; // shadows inherited length
@@ -84,7 +87,8 @@ partial interface Document {
 Document implements GlobalEventHandlers;
 Document implements DocumentAndElementEventHandlers;
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLElement : Element {
   // metadata attributes
   [CEReactions] attribute DOMString title;
@@ -97,7 +101,7 @@ interface HTMLElement : Element {
   [CEReactions] attribute boolean hidden;
   void click();
   [CEReactions] attribute long tabIndex;
-  void focus();
+  void focus(optional FocusOptions options);
   void blur();
   [CEReactions] attribute DOMString accessKey;
   readonly attribute DOMString accessKeyLabel;
@@ -106,6 +110,11 @@ interface HTMLElement : Element {
 
   [CEReactions] attribute [TreatNullAs=EmptyString] DOMString innerText;
 };
+
+dictionary FocusOptions {
+  boolean preventScroll = false;
+};
+
 HTMLElement implements GlobalEventHandlers;
 HTMLElement implements DocumentAndElementEventHandlers;
 HTMLElement implements ElementContentEditable;
@@ -113,33 +122,39 @@ HTMLElement implements ElementContentEditable;
 // Note: intentionally not [HTMLConstructor]
 interface HTMLUnknownElement : HTMLElement { };
 
-[OverrideBuiltins]
+[Exposed=Window,
+ OverrideBuiltins]
 interface DOMStringMap {
   getter DOMString (DOMString name);
   [CEReactions] setter void (DOMString name, DOMString value);
   [CEReactions] deleter void (DOMString name);
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLHtmlElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLHeadElement : HTMLElement {};
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTitleElement : HTMLElement {
   [CEReactions] attribute DOMString text;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLBaseElement : HTMLElement {
   [CEReactions] attribute USVString href;
   [CEReactions] attribute DOMString target;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLLinkElement : HTMLElement {
   [CEReactions] attribute USVString href;
   [CEReactions] attribute DOMString? crossOrigin;
@@ -161,7 +176,8 @@ interface HTMLLinkElement : HTMLElement {
 };
 HTMLLinkElement implements LinkStyle;
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLMetaElement : HTMLElement {
   [CEReactions] attribute DOMString name;
   [CEReactions] attribute DOMString httpEquiv;
@@ -170,7 +186,8 @@ interface HTMLMetaElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLStyleElement : HTMLElement {
   [CEReactions] attribute DOMString media;
   [CEReactions] attribute DOMString nonce;
@@ -178,39 +195,46 @@ interface HTMLStyleElement : HTMLElement {
 };
 HTMLStyleElement implements LinkStyle;
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLBodyElement : HTMLElement {
   // also has obsolete members
 };
 
 HTMLBodyElement implements WindowEventHandlers;
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLHeadingElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLParagraphElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLHRElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLPreElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLQuoteElement : HTMLElement {
   [CEReactions] attribute USVString cite;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLOListElement : HTMLElement {
   [CEReactions] attribute boolean reversed;
   [CEReactions] attribute long start;
@@ -219,35 +243,41 @@ interface HTMLOListElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLUListElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLMenuElement : HTMLElement {
 
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLLIElement : HTMLElement {
   [CEReactions] attribute long value;
 
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLDListElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLDivElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLAnchorElement : HTMLElement {
   [CEReactions] attribute DOMString target;
   [CEReactions] attribute DOMString download;
@@ -265,25 +295,30 @@ interface HTMLAnchorElement : HTMLElement {
 };
 HTMLAnchorElement implements HTMLHyperlinkElementUtils;
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLDataElement : HTMLElement {
   [CEReactions] attribute DOMString value;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTimeElement : HTMLElement {
   [CEReactions] attribute DOMString dateTime;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLSpanElement : HTMLElement {};
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLBRElement : HTMLElement {
   // also has obsolete members
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface HTMLHyperlinkElementUtils {
   [CEReactions] stringifier attribute USVString href;
   readonly attribute USVString origin;
@@ -298,16 +333,19 @@ interface HTMLHyperlinkElementUtils {
   [CEReactions] attribute USVString hash;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLModElement : HTMLElement {
   [CEReactions] attribute USVString cite;
   [CEReactions] attribute DOMString dateTime;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLPictureElement : HTMLElement {};
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLSourceElement : HTMLElement {
   [CEReactions] attribute USVString src;
   [CEReactions] attribute DOMString type;
@@ -316,7 +354,9 @@ interface HTMLSourceElement : HTMLElement {
   [CEReactions] attribute DOMString media;
 };
 
-[HTMLConstructor, NamedConstructor=Image(optional unsigned long width, optional unsigned long height)]
+[Exposed=Window,
+ HTMLConstructor,
+ NamedConstructor=Image(optional unsigned long width, optional unsigned long height)]
 interface HTMLImageElement : HTMLElement {
   [CEReactions] attribute DOMString alt;
   [CEReactions] attribute USVString src;
@@ -338,7 +378,8 @@ interface HTMLImageElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLIFrameElement : HTMLElement {
   [CEReactions] attribute USVString src;
   [CEReactions] attribute DOMString srcdoc;
@@ -353,11 +394,13 @@ interface HTMLIFrameElement : HTMLElement {
   readonly attribute Document? contentDocument;
   readonly attribute WindowProxy? contentWindow;
   Document? getSVGDocument();
+  [SameObject, PutForwards=value] readonly attribute DOMTokenList delegateStickyUserActivation;
 
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLEmbedElement : HTMLElement {
   [CEReactions] attribute USVString src;
   [CEReactions] attribute DOMString type;
@@ -368,7 +411,8 @@ interface HTMLEmbedElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLObjectElement : HTMLElement {
   [CEReactions] attribute USVString data;
   [CEReactions] attribute DOMString type;
@@ -392,7 +436,8 @@ interface HTMLObjectElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLParamElement : HTMLElement {
   [CEReactions] attribute DOMString name;
   [CEReactions] attribute DOMString value;
@@ -400,7 +445,8 @@ interface HTMLParamElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLVideoElement : HTMLMediaElement {
   [CEReactions] attribute unsigned long width;
   [CEReactions] attribute unsigned long height;
@@ -410,10 +456,13 @@ interface HTMLVideoElement : HTMLMediaElement {
   [CEReactions] attribute boolean playsInline;
 };
 
-[HTMLConstructor, NamedConstructor=Audio(optional DOMString src)]
+[Exposed=Window,
+ HTMLConstructor,
+ NamedConstructor=Audio(optional DOMString src)]
 interface HTMLAudioElement : HTMLMediaElement {};
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTrackElement : HTMLElement {
   [CEReactions] attribute DOMString kind;
   [CEReactions] attribute USVString src;
@@ -432,6 +481,8 @@ interface HTMLTrackElement : HTMLElement {
 
 enum CanPlayTypeResult { "" /* empty string */, "maybe", "probably" };
 typedef (MediaStream or MediaSource or Blob) MediaProvider;
+
+[Exposed=Window]
 interface HTMLMediaElement : HTMLElement {
 
   // error state
@@ -490,6 +541,7 @@ interface HTMLMediaElement : HTMLElement {
   TextTrack addTextTrack(TextTrackKind kind, optional DOMString label = "", optional DOMString language = "");
 };
 
+[Exposed=Window]
 interface MediaError {
   const unsigned short MEDIA_ERR_ABORTED = 1;
   const unsigned short MEDIA_ERR_NETWORK = 2;
@@ -500,6 +552,7 @@ interface MediaError {
   readonly attribute DOMString message;
 };
 
+[Exposed=Window]
 interface AudioTrackList : EventTarget {
   readonly attribute unsigned long length;
   getter AudioTrack (unsigned long index);
@@ -510,6 +563,7 @@ interface AudioTrackList : EventTarget {
   attribute EventHandler onremovetrack;
 };
 
+[Exposed=Window]
 interface AudioTrack {
   readonly attribute DOMString id;
   readonly attribute DOMString kind;
@@ -518,6 +572,7 @@ interface AudioTrack {
   attribute boolean enabled;
 };
 
+[Exposed=Window]
 interface VideoTrackList : EventTarget {
   readonly attribute unsigned long length;
   getter VideoTrack (unsigned long index);
@@ -529,6 +584,7 @@ interface VideoTrackList : EventTarget {
   attribute EventHandler onremovetrack;
 };
 
+[Exposed=Window]
 interface VideoTrack {
   readonly attribute DOMString id;
   readonly attribute DOMString kind;
@@ -537,6 +593,7 @@ interface VideoTrack {
   attribute boolean selected;
 };
 
+[Exposed=Window]
 interface TextTrackList : EventTarget {
   readonly attribute unsigned long length;
   getter TextTrack (unsigned long index);
@@ -549,6 +606,8 @@ interface TextTrackList : EventTarget {
 
 enum TextTrackMode { "disabled",  "hidden",  "showing" };
 enum TextTrackKind { "subtitles",  "captions",  "descriptions",  "chapters",  "metadata" };
+
+[Exposed=Window]
 interface TextTrack : EventTarget {
   readonly attribute TextTrackKind kind;
   readonly attribute DOMString label;
@@ -568,12 +627,14 @@ interface TextTrack : EventTarget {
   attribute EventHandler oncuechange;
 };
 
+[Exposed=Window]
 interface TextTrackCueList {
   readonly attribute unsigned long length;
   getter TextTrackCue (unsigned long index);
   TextTrackCue? getCueById(DOMString id);
 };
 
+[Exposed=Window]
 interface TextTrackCue : EventTarget {
   readonly attribute TextTrack? track;
 
@@ -586,13 +647,15 @@ interface TextTrackCue : EventTarget {
   attribute EventHandler onexit;
 };
 
+[Exposed=Window]
 interface TimeRanges {
   readonly attribute unsigned long length;
   double start(unsigned long index);
   double end(unsigned long index);
 };
 
-[Constructor(DOMString type, optional TrackEventInit eventInitDict)]
+[Exposed=Window,
+ Constructor(DOMString type, optional TrackEventInit eventInitDict)]
 interface TrackEvent : Event {
   readonly attribute (VideoTrack or AudioTrack or TextTrack)? track;
 };
@@ -601,13 +664,15 @@ dictionary TrackEventInit : EventInit {
   (VideoTrack or AudioTrack or TextTrack)? track = null;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLMapElement : HTMLElement {
   [CEReactions] attribute DOMString name;
   [SameObject] readonly attribute HTMLCollection areas;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLAreaElement : HTMLElement {
   [CEReactions] attribute DOMString alt;
   [CEReactions] attribute DOMString coords;
@@ -623,7 +688,8 @@ interface HTMLAreaElement : HTMLElement {
 };
 HTMLAreaElement implements HTMLHyperlinkElementUtils;
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTableElement : HTMLElement {
   [CEReactions] attribute HTMLTableCaptionElement? caption;
   HTMLTableCaptionElement createCaption();
@@ -647,19 +713,22 @@ interface HTMLTableElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTableCaptionElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTableColElement : HTMLElement {
   [CEReactions] attribute unsigned long span;
 
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTableSectionElement : HTMLElement {
   [SameObject] readonly attribute HTMLCollection rows;
   HTMLElement insertRow(optional long index = -1);
@@ -668,7 +737,8 @@ interface HTMLTableSectionElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTableRowElement : HTMLElement {
   readonly attribute long rowIndex;
   readonly attribute long sectionRowIndex;
@@ -679,7 +749,8 @@ interface HTMLTableRowElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTableCellElement : HTMLElement {
   [CEReactions] attribute unsigned long colSpan;
   [CEReactions] attribute unsigned long rowSpan;
@@ -692,7 +763,10 @@ interface HTMLTableCellElement : HTMLElement {
   // also has obsolete members
 };
 
-[OverrideBuiltins, LegacyUnenumerableNamedProperties, HTMLConstructor]
+[Exposed=Window,
+ OverrideBuiltins,
+ LegacyUnenumerableNamedProperties,
+ HTMLConstructor]
 interface HTMLFormElement : HTMLElement {
   [CEReactions] attribute DOMString acceptCharset;
   [CEReactions] attribute USVString action;
@@ -715,14 +789,16 @@ interface HTMLFormElement : HTMLElement {
   boolean reportValidity();
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLLabelElement : HTMLElement {
   readonly attribute HTMLFormElement? form;
   [CEReactions] attribute DOMString htmlFor;
   readonly attribute HTMLElement? control;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLInputElement : HTMLElement {
   [CEReactions] attribute DOMString accept;
   [CEReactions] attribute DOMString alt;
@@ -786,7 +862,8 @@ interface HTMLInputElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLButtonElement : HTMLElement {
   [CEReactions] attribute boolean autofocus;
   [CEReactions] attribute boolean disabled;
@@ -810,7 +887,8 @@ interface HTMLButtonElement : HTMLElement {
   readonly attribute NodeList labels;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLSelectElement : HTMLElement {
   [CEReactions] attribute DOMString autocomplete;
   [CEReactions] attribute boolean autofocus;
@@ -846,18 +924,22 @@ interface HTMLSelectElement : HTMLElement {
   readonly attribute NodeList labels;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLDataListElement : HTMLElement {
   [SameObject] readonly attribute HTMLCollection options;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLOptGroupElement : HTMLElement {
   [CEReactions] attribute boolean disabled;
   [CEReactions] attribute DOMString label;
 };
 
-[HTMLConstructor, NamedConstructor=Option(optional DOMString text = "", optional DOMString value, optional boolean defaultSelected = false, optional boolean selected = false)]
+[Exposed=Window,
+ HTMLConstructor,
+ NamedConstructor=Option(optional DOMString text = "", optional DOMString value, optional boolean defaultSelected = false, optional boolean selected = false)]
 interface HTMLOptionElement : HTMLElement {
   [CEReactions] attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
@@ -870,7 +952,8 @@ interface HTMLOptionElement : HTMLElement {
   readonly attribute long index;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTextAreaElement : HTMLElement {
   [CEReactions] attribute DOMString autocomplete;
   [CEReactions] attribute boolean autofocus;
@@ -911,7 +994,8 @@ interface HTMLTextAreaElement : HTMLElement {
   void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLOutputElement : HTMLElement {
   [SameObject, PutForwards=value] readonly attribute DOMTokenList htmlFor;
   readonly attribute HTMLFormElement? form;
@@ -931,7 +1015,8 @@ interface HTMLOutputElement : HTMLElement {
   readonly attribute NodeList labels;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLProgressElement : HTMLElement {
   [CEReactions] attribute double value;
   [CEReactions] attribute double max;
@@ -939,7 +1024,8 @@ interface HTMLProgressElement : HTMLElement {
   readonly attribute NodeList labels;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLMeterElement : HTMLElement {
   [CEReactions] attribute double value;
   [CEReactions] attribute double min;
@@ -950,7 +1036,8 @@ interface HTMLMeterElement : HTMLElement {
   readonly attribute NodeList labels;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLFieldSetElement : HTMLElement {
   [CEReactions] attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
@@ -968,7 +1055,8 @@ interface HTMLFieldSetElement : HTMLElement {
   void setCustomValidity(DOMString error);
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLLegendElement : HTMLElement {
   readonly attribute HTMLFormElement? form;
 
@@ -982,6 +1070,7 @@ enum SelectionMode {
   "preserve" // default
 };
 
+[Exposed=Window]
 interface ValidityState {
   readonly attribute boolean valueMissing;
   readonly attribute boolean typeMismatch;
@@ -996,12 +1085,14 @@ interface ValidityState {
   readonly attribute boolean valid;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLDetailsElement : HTMLElement {
   [CEReactions] attribute boolean open;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLDialogElement : HTMLElement {
   [CEReactions] attribute boolean open;
   attribute DOMString returnValue;
@@ -1010,12 +1101,12 @@ interface HTMLDialogElement : HTMLElement {
   [CEReactions] void close(optional DOMString returnValue);
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLScriptElement : HTMLElement {
   [CEReactions] attribute USVString src;
   [CEReactions] attribute DOMString type;
   [CEReactions] attribute boolean noModule;
-  [CEReactions] attribute DOMString charset;
   [CEReactions] attribute boolean async;
   [CEReactions] attribute boolean defer;
   [CEReactions] attribute DOMString? crossOrigin;
@@ -1027,12 +1118,14 @@ interface HTMLScriptElement : HTMLElement {
   // also has obsolete members
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLTemplateElement : HTMLElement {
   readonly attribute DocumentFragment content;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLSlotElement : HTMLElement {
   [CEReactions] attribute DOMString name;
   sequence<Node> assignedNodes(optional AssignedNodesOptions options);
@@ -1044,7 +1137,8 @@ dictionary AssignedNodesOptions {
 
 typedef (CanvasRenderingContext2D or WebGLRenderingContext) RenderingContext;
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLCanvasElement : HTMLElement {
   [CEReactions] attribute unsigned long width;
   [CEReactions] attribute unsigned long height;
@@ -1075,6 +1169,7 @@ dictionary CanvasRenderingContext2DSettings {
 
 enum ImageSmoothingQuality { "low", "medium", "high" };
 
+[Exposed=Window]
 interface CanvasRenderingContext2D {
   // back-reference to the canvas
   readonly attribute HTMLCanvasElement canvas;
@@ -1184,7 +1279,8 @@ interface CanvasDrawPath {
   boolean isPointInStroke(Path2D path, unrestricted double x, unrestricted double y);
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface CanvasUserInterface {
   void drawFocusIfNeeded(Element element);
   void drawFocusIfNeeded(Path2D path, Element element);
@@ -1192,7 +1288,8 @@ interface CanvasUserInterface {
   void scrollPathIntoView(Path2D path);
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface CanvasText {
   // text (see also the CanvasPathDrawingStyles and CanvasTextDrawingStyles interfaces)
   void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
@@ -1238,7 +1335,8 @@ interface CanvasPathDrawingStyles {
   attribute unrestricted double lineDashOffset;
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface CanvasTextDrawingStyles {
   // text
   attribute DOMString font; // (default 10px sans-serif)
@@ -1274,6 +1372,7 @@ interface CanvasPattern {
   void setTransform(optional DOMMatrix2DInit transform);
 };
 
+[Exposed=Window]
 interface TextMetrics {
   // x-direction
   readonly attribute double width; // advance width
@@ -1312,6 +1411,7 @@ interface Path2D {
 };
 Path2D implements CanvasPath;
 
+[Exposed=Window]
 interface ImageBitmapRenderingContext {
   readonly attribute HTMLCanvasElement canvas;
   void transferFromImageBitmap(ImageBitmap? bitmap);
@@ -1363,6 +1463,7 @@ OffscreenCanvasRenderingContext2D implements CanvasPathDrawingStyles;
 OffscreenCanvasRenderingContext2D implements CanvasPath;
 
 
+[Exposed=Window]
 interface CustomElementRegistry {
   [CEReactions] void define(DOMString name, Function constructor, optional ElementDefinitionOptions options);
   any get(DOMString name);
@@ -1373,13 +1474,15 @@ dictionary ElementDefinitionOptions {
   DOMString extends;
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface ElementContentEditable {
   [CEReactions] attribute DOMString contentEditable;
   readonly attribute boolean isContentEditable;
 };
 
-[Constructor, Exposed=(Window)]
+[Exposed=Window,
+ Constructor]
   interface DataTransfer {
   attribute DOMString dropEffect;
   attribute DOMString effectAllowed;
@@ -1396,6 +1499,7 @@ interface ElementContentEditable {
   [SameObject] readonly attribute FileList files;
 };
 
+[Exposed=Window]
 interface DataTransferItemList {
   readonly attribute unsigned long length;
   getter DataTransferItem (unsigned long index);
@@ -1405,6 +1509,7 @@ interface DataTransferItemList {
   void clear();
 };
 
+[Exposed=Window]
 interface DataTransferItem {
   readonly attribute DOMString kind;
   readonly attribute DOMString type;
@@ -1414,7 +1519,8 @@ interface DataTransferItem {
 
 callback FunctionStringCallback = void (DOMString data);
 
-[Constructor(DOMString type, optional DragEventInit eventInitDict)]
+[Exposed=Window,
+ Constructor(DOMString type, optional DragEventInit eventInitDict)]
 interface DragEvent : MouseEvent {
   readonly attribute DataTransfer? dataTransfer;
 };
@@ -1482,13 +1588,16 @@ Window implements WindowEventHandlers;
 
 callback FrameRequestCallback = void (DOMHighResTimeStamp time);
 
+[Exposed=Window]
 interface BarProp {
   readonly attribute boolean visible;
 };
 
 enum ScrollRestoration { "auto", "manual" };
 
+[Exposed=Window]
 interface History {
+  readonly attribute unsigned long index;
   readonly attribute unsigned long length;
   attribute ScrollRestoration scrollRestoration;
   readonly attribute any state;
@@ -1499,6 +1608,7 @@ interface History {
   void replaceState(any data, DOMString title, optional USVString? url = null);
 };
 
+[Exposed=Window]
 interface Location { // but see also additional creation steps and overridden internal methods
   [Unforgeable] stringifier attribute USVString href;
   [Unforgeable] readonly attribute USVString origin;
@@ -1517,7 +1627,8 @@ interface Location { // but see also additional creation steps and overridden in
   [Unforgeable, SameObject] readonly attribute DOMStringList ancestorOrigins;
 };
 
-[Constructor(DOMString type, optional PopStateEventInit eventInitDict)]
+[Exposed=Window,
+ Constructor(DOMString type, optional PopStateEventInit eventInitDict)]
 interface PopStateEvent : Event {
   readonly attribute any state;
 };
@@ -1526,7 +1637,8 @@ dictionary PopStateEventInit : EventInit {
   any state = null;
 };
 
-[Constructor(DOMString type, optional HashChangeEventInit eventInitDict)]
+[Exposed=Window,
+ Constructor(DOMString type, optional HashChangeEventInit eventInitDict)]
 interface HashChangeEvent : Event {
   readonly attribute USVString oldURL;
   readonly attribute USVString newURL;
@@ -1537,7 +1649,8 @@ dictionary HashChangeEventInit : EventInit {
   USVString newURL = "";
 };
 
-[Constructor(DOMString type, optional PageTransitionEventInit eventInitDict)]
+[Exposed=Window,
+ Constructor(DOMString type, optional PageTransitionEventInit eventInitDict)]
 interface PageTransitionEvent : Event {
   readonly attribute boolean persisted;
 };
@@ -1546,10 +1659,12 @@ dictionary PageTransitionEventInit : EventInit {
   boolean persisted = false;
 };
 
+[Exposed=Window]
 interface BeforeUnloadEvent : Event {
   attribute DOMString returnValue;
 };
 
+[Exposed=Window]
 interface ApplicationCache : EventTarget {
 
   // update status
@@ -1622,7 +1737,8 @@ typedef OnErrorEventHandlerNonNull? OnErrorEventHandler;
 callback OnBeforeUnloadEventHandlerNonNull = DOMString? (Event event);
 typedef OnBeforeUnloadEventHandlerNonNull? OnBeforeUnloadEventHandler;
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface GlobalEventHandlers {
   attribute EventHandler onabort;
   attribute EventHandler onauxclick;
@@ -1688,7 +1804,8 @@ interface GlobalEventHandlers {
   attribute EventHandler onwaiting;
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface WindowEventHandlers {
   attribute EventHandler onafterprint;
   attribute EventHandler onbeforeprint;
@@ -1708,7 +1825,8 @@ interface WindowEventHandlers {
   attribute EventHandler onunload;
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface DocumentAndElementEventHandlers {
   attribute EventHandler oncopy;
   attribute EventHandler oncut;
@@ -1723,7 +1841,7 @@ interface WindowOrWorkerGlobalScope {
 
   // base64 utility methods
   DOMString btoa(DOMString data);
-  DOMString atob(DOMString data);
+  ByteString atob(DOMString data);
 
   // timers
   long setTimeout(TimerHandler handler, optional long timeout = 0, any... arguments);
@@ -1738,6 +1856,7 @@ interface WindowOrWorkerGlobalScope {
 Window implements WindowOrWorkerGlobalScope;
 WorkerGlobalScope implements WindowOrWorkerGlobalScope;
 
+[Exposed=Window]
 interface Navigator {
   // objects implementing this interface also implement the interfaces given below
 };
@@ -1775,25 +1894,29 @@ interface NavigatorLanguage {
   readonly attribute FrozenArray<DOMString> languages;
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface NavigatorContentUtils {
   void registerProtocolHandler(DOMString scheme, USVString url, DOMString title);
   void unregisterProtocolHandler(DOMString scheme, USVString url);
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface NavigatorCookies {
   readonly attribute boolean cookieEnabled;
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface NavigatorPlugins {
   [SameObject] readonly attribute PluginArray plugins;
   [SameObject] readonly attribute MimeTypeArray mimeTypes;
   boolean javaEnabled();
 };
 
-[LegacyUnenumerableNamedProperties]
+[Exposed=Window,
+ LegacyUnenumerableNamedProperties]
 interface PluginArray {
   void refresh(optional boolean reload = false);
   readonly attribute unsigned long length;
@@ -1801,14 +1924,16 @@ interface PluginArray {
   getter Plugin? namedItem(DOMString name);
 };
 
-[LegacyUnenumerableNamedProperties]
+[Exposed=Window,
+ LegacyUnenumerableNamedProperties]
 interface MimeTypeArray {
   readonly attribute unsigned long length;
   getter MimeType? item(unsigned long index);
   getter MimeType? namedItem(DOMString name);
 };
 
-[LegacyUnenumerableNamedProperties]
+[Exposed=Window,
+ LegacyUnenumerableNamedProperties]
 interface Plugin {
   readonly attribute DOMString name;
   readonly attribute DOMString description;
@@ -1818,6 +1943,7 @@ interface Plugin {
   getter MimeType? namedItem(DOMString name);
 };
 
+[Exposed=Window]
 interface MimeType {
   readonly attribute DOMString type;
   readonly attribute DOMString description;
@@ -1850,7 +1976,7 @@ dictionary ImageBitmapOptions {
   ResizeQuality resizeQuality = "low";
 };
 
-[Constructor(DOMString type, optional MessageEventInit eventInitDict), Exposed=(Window,Worker)]
+[Constructor(DOMString type, optional MessageEventInit eventInitDict), Exposed=(Window,Worker,AudioWorklet)]
 interface MessageEvent : Event {
   readonly attribute any data;
   readonly attribute USVString origin;
@@ -1942,7 +2068,7 @@ interface MessageChannel {
   readonly attribute MessagePort port2;
 };
 
-[Exposed=(Window,Worker), Transferable]
+[Exposed=(Window,Worker,AudioWorklet), Transferable]
 interface MessagePort : EventTarget {
   void postMessage(any message, optional sequence<object> transfer = []);
   void start();
@@ -2054,6 +2180,7 @@ interface WorkerLocation {
   readonly attribute USVString hash;
 };
 
+[Exposed=Window]
 interface Storage {
   readonly attribute unsigned long length;
   DOMString? key(unsigned long index);
@@ -2063,19 +2190,22 @@ interface Storage {
   void clear();
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface WindowSessionStorage {
   readonly attribute Storage sessionStorage;
 };
 Window implements WindowSessionStorage;
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface WindowLocalStorage {
   readonly attribute Storage localStorage;
 };
 Window implements WindowLocalStorage;
 
-[Constructor(DOMString type, optional StorageEventInit eventInitDict)]
+[Exposed=Window,
+ Constructor(DOMString type, optional StorageEventInit eventInitDict)]
 interface StorageEvent : Event {
   readonly attribute DOMString? key;
   readonly attribute DOMString? oldValue;
@@ -2092,22 +2222,8 @@ dictionary StorageEventInit : EventInit {
   Storage? storageArea = null;
 };
 
-// Note: intentionally not [HTMLConstructor]
-interface HTMLAppletElement : HTMLElement {
-  attribute DOMString align;
-  attribute DOMString alt;
-  attribute DOMString archive;
-  attribute DOMString code;
-  attribute USVString codeBase;
-  attribute DOMString height;
-  attribute unsigned long hspace;
-  attribute DOMString name;
-  attribute USVString _object; // the underscore is not part of the identifier
-  attribute unsigned long vspace;
-  attribute DOMString width;
-};
-
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLMarqueeElement : HTMLElement {
   [CEReactions] attribute DOMString behavior;
   [CEReactions] attribute DOMString bgColor;
@@ -2129,14 +2245,16 @@ interface HTMLMarqueeElement : HTMLElement {
   void stop();
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLFrameSetElement : HTMLElement {
   [CEReactions] attribute DOMString cols;
   [CEReactions] attribute DOMString rows;
 };
 HTMLFrameSetElement implements WindowEventHandlers;
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLFrameElement : HTMLElement {
   [CEReactions] attribute DOMString name;
   [CEReactions] attribute DOMString scrolling;
@@ -2188,7 +2306,8 @@ partial interface HTMLTableColElement {
   [CEReactions] attribute DOMString width;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLDirectoryElement : HTMLElement {
   [CEReactions] attribute boolean compact;
 };
@@ -2206,7 +2325,8 @@ partial interface HTMLEmbedElement {
   [CEReactions] attribute DOMString name;
 };
 
-[HTMLConstructor]
+[Exposed=Window,
+ HTMLConstructor]
 interface HTMLFontElement : HTMLElement {
   [CEReactions] attribute [TreatNullAs=EmptyString] DOMString color;
   [CEReactions] attribute DOMString face;
@@ -2309,6 +2429,7 @@ partial interface HTMLPreElement {
 };
 
 partial interface HTMLScriptElement {
+  [CEReactions] attribute DOMString charset;
   [CEReactions] attribute DOMString event;
   [CEReactions] attribute DOMString htmlFor;
 };
@@ -2385,7 +2506,8 @@ partial interface Window {
   [Replaceable, SameObject] readonly attribute External external;
 };
 
-[NoInterfaceObject]
+[Exposed=Window,
+ NoInterfaceObject]
 interface External {
   void AddSearchProvider();
   void IsSearchProviderInstalled();
diff --git a/tests/wpt/web-platform-tests/interfaces/wake-lock.idl b/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
new file mode 100644
index 0000000000000..4e2b257d24efe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
@@ -0,0 +1,23 @@
+enum WakeLockType {
+    "screen",
+    "system"
+};
+
+partial interface Navigator {
+    [SecureContext] Promise<WakeLock> getWakeLock(WakeLockType type);
+};
+
+[SecureContext,
+ Exposed=Window]
+interface WakeLock : EventTarget {
+    readonly attribute WakeLockType type;
+    readonly attribute boolean      active;
+             attribute EventHandler onactivechange;
+    WakeLockRequest createRequest();
+};
+
+[SecureContext,
+ Exposed=Window]
+interface WakeLockRequest {
+    void cancel();
+};
diff --git a/tests/wpt/web-platform-tests/lint.whitelist b/tests/wpt/web-platform-tests/lint.whitelist
index af6a293dd8f89..77ba95230a1c9 100644
--- a/tests/wpt/web-platform-tests/lint.whitelist
+++ b/tests/wpt/web-platform-tests/lint.whitelist
@@ -146,6 +146,7 @@ PARSE-FAILED:content-security-policy/svg/including.sub.svg
 #Helper files that aren't valid XML
 PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/empty.xml
 PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/minimal_html.xml
+PARSE-FAILED:acid/acid3/empty.xml
 
 # The patches may have trailing whitespace
 TRAILING WHITESPACE:webgl/tools/*.patch
@@ -338,6 +339,9 @@ GENERATE_TESTS: shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/w
 # Intentional use of setTimeout
 SET TIMEOUT: html/webappapis/timers/*
 
+# setTimeout use in reftests
+SET TIMEOUT: acid/acid3/test.html
+
 # CI scripts
 PRINT STATEMENT:check_stability.py
 W3C-TEST.ORG:check_stability.py
diff --git a/tests/wpt/web-platform-tests/longtask-timing/shared-renderer/longtask-in-new-window.html b/tests/wpt/web-platform-tests/longtask-timing/shared-renderer/longtask-in-new-window.html
new file mode 100644
index 0000000000000..ebe9cdcb727ce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/longtask-timing/shared-renderer/longtask-in-new-window.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>LongTask Timing: long task in another window</title>
+<body>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+/* This test should pass even when windows share a single renderer process.
+  This window opens a new window which contains a longtask. We test that the
+  longtask from the new window is not observed by the observer of this window. */
+async_test(t => {
+  const observer = new PerformanceObserver(
+      t.step_func(function (entryList) {
+          const entries = entryList.getEntries();
+          let markFound = false;
+          for (let i = 0; i < entries.length; ++i) {
+            const entry = entries[i];
+            // We do not expect to observe longtasks but the work being made in this window may produce a longtask.
+            assert_true(entry.entryType === 'longtask' ||
+              entry.entryType === 'mark');
+            if (entry.entryType === 'mark') {
+              markFound = true;
+              continue;
+            }
+            // If a longtask is observed, it must come from this window.
+            assert_equals(entry.name, 'self');
+          }
+          // If we found the mark, then the other window longtask is done.
+          if (markFound)
+            t.done();
+      })
+  );
+  observer.observe({entryTypes: ['mark', 'longtask']});
+
+  // Open a window with a longtask.
+  const other_window = window.open('resources/frame-with-longtask.html');
+  window.addEventListener('message', t.step_func(e => {
+    // Do a mark (after the other window's longtask) to fire the callback.
+    self.performance.mark('mark1');
+  }));
+}, 'A longtask in a frame from window.open is not reported in original frame');
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/longtask-timing/shared-renderer/resources/frame-with-longtask.html b/tests/wpt/web-platform-tests/longtask-timing/shared-renderer/resources/frame-with-longtask.html
new file mode 100644
index 0000000000000..72e525f04d119
--- /dev/null
+++ b/tests/wpt/web-platform-tests/longtask-timing/shared-renderer/resources/frame-with-longtask.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<meta name="viewport" content="width=device-width">
+
+<title>Long Task Frame</title>
+<body>
+<h1>Long Task plus PostMessage</h1>
+
+<script>
+  const begin = window.performance.now();
+  while (window.performance.now() < begin + 51);
+  window.opener.postMessage('Finished.', '*');
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer_insecure_context.html b/tests/wpt/web-platform-tests/magnetometer/Magnetometer_insecure_context.html
index 452bfc1c6eef0..307c19b101b81 100644
--- a/tests/wpt/web-platform-tests/magnetometer/Magnetometer_insecure_context.html
+++ b/tests/wpt/web-platform-tests/magnetometer/Magnetometer_insecure_context.html
@@ -15,6 +15,6 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorInsecureContext(Magnetometer);
+runGenericSensorInsecureContext("Magnetometer");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/magnetometer/idlharness.https.html b/tests/wpt/web-platform-tests/magnetometer/idlharness.https.html
index 2f98dda24d095..1e90ce1954f41 100644
--- a/tests/wpt/web-platform-tests/magnetometer/idlharness.https.html
+++ b/tests/wpt/web-platform-tests/magnetometer/idlharness.https.html
@@ -24,6 +24,7 @@
 [SecureContext, Exposed=Window]
 interface Sensor : EventTarget {
   readonly attribute boolean activated;
+  readonly attribute boolean hasReading;
   readonly attribute DOMHighResTimeStamp? timestamp;
   void start();
   void stop();
@@ -34,19 +35,19 @@
 
 [Constructor(optional SensorOptions sensorOptions), Exposed=Window]
 interface Magnetometer : Sensor {
-  readonly attribute unrestricted double? x;
-  readonly attribute unrestricted double? y;
-  readonly attribute unrestricted double? z;
+  readonly attribute double? x;
+  readonly attribute double? y;
+  readonly attribute double? z;
 };
 
 [Constructor(optional SensorOptions sensorOptions), Exposed=Window]
 interface UncalibratedMagnetometer : Sensor {
-  readonly attribute unrestricted double? x;
-  readonly attribute unrestricted double? y;
-  readonly attribute unrestricted double? z;
-  readonly attribute unrestricted double? xBias;
-  readonly attribute unrestricted double? yBias;
-  readonly attribute unrestricted double? zBias;
+  readonly attribute double? x;
+  readonly attribute double? y;
+  readonly attribute double? z;
+  readonly attribute double? xBias;
+  readonly attribute double? yBias;
+  readonly attribute double? zBias;
 };
 </script>
 
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-default-feature-policy.https.sub.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-default-feature-policy.https.html
similarity index 90%
rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-default-feature-policy.https.sub.html
rename to tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-default-feature-policy.https.html
index 1f48e854f7ecf..12e64925847f1 100644
--- a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-default-feature-policy.https.sub.html
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-default-feature-policy.https.html
@@ -2,8 +2,8 @@
 <body>
   <script src=/resources/testharness.js></script>
   <script src=/resources/testharnessreport.js></script>
+  <script src=/common/get-host-info.sub.js></script>
   <script src=/feature-policy/resources/featurepolicy.js></script>
-  <script src=util/utils.js></script>
   <script>
   'use strict';
 
@@ -33,8 +33,9 @@
     });
   };
 
+  var cross_domain = get_host_info().HTTPS_REMOTE_ORIGIN;
   run_all_fp_tests_allow_self(
-      'https://{{domains[www]}}:{{ports[https][0]}}',
+      cross_domain,
       'microphone',
       '[object NavigatorUserMediaError]',
       function() {
@@ -42,7 +43,7 @@
       });
 
   run_all_fp_tests_allow_self(
-      'https://{{domains[www]}}:{{ports[https][0]}}',
+      cross_domain,
       'camera',
       '[object NavigatorUserMediaError]',
       function() {
@@ -50,7 +51,7 @@
       });
 
   run_all_fp_tests_allow_self(
-    'https://{{domains[www]}}:{{ports[https][0]}}',
+    cross_domain,
     'camera; microphone',
     '[object NavigatorUserMediaError]',
     function() {
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-idl.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-idl.https.html
new file mode 100644
index 0000000000000..5164d99728402
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-idl.https.html
@@ -0,0 +1,52 @@
+<!doctype html>
+<title>MediaStreamTrack IDL tests</title>
+<link rel="help" href="https://w3c.github.io/mediacapture-main/#media-stream-track-interface-definition">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/resources/WebIDLParser.js></script>
+<script src=/resources/idlharness.js></script>
+<script>
+function idl_test([dom_idl, stream]) {
+  const idl_array = new IdlArray();
+
+  idl_array.add_untested_idls(dom_idl);
+  idl_array.add_untested_idls('interface EventHandler {};');
+  idl_array.add_idls("interface MediaStreamTrack : EventTarget {\
+    readonly    attribute DOMString             kind;\
+    readonly    attribute DOMString             id;\
+    readonly    attribute DOMString             label;\
+                attribute boolean               enabled;\
+    readonly    attribute boolean               muted;\
+                attribute EventHandler          onmute;\
+                attribute EventHandler          onunmute;\
+    readonly    attribute MediaStreamTrackState readyState;\
+                attribute EventHandler          onended;\
+                attribute EventHandler          onoverconstrained;\
+    MediaStreamTrack       clone ();\
+    void                   stop ();\
+    MediaTrackCapabilities getCapabilities ();\
+    MediaTrackConstraints  getConstraints ();\
+    MediaTrackSettings     getSettings ();\
+    Promise<void>          applyConstraints (optional MediaTrackConstraints constraints);\
+};\
+\
+enum MediaStreamTrackState {\
+    \"live\",\
+    \"ended\"\
+};");
+
+  self.track = stream.getTracks()[0];
+  idl_array.add_objects({MediaStreamTrack: ["track"]});
+
+  idl_array.test();
+}
+
+promise_test(() => {
+  return Promise.all([
+    fetch("/interfaces/dom.idl").then(response => response.text()),
+    navigator.mediaDevices.getUserMedia({audio: true}),
+  ]).then(idl_test);
+}, "Test driver")
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-init.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-init.https.html
index a51cb67913cc8..e3e5ada541cb5 100644
--- a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-init.https.html
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-init.https.html
@@ -18,53 +18,19 @@ <h1 class="instructions">Description</h1>
 <div id='log'></div>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
-<script src=/resources/WebIDLParser.js></script>
-<script src=/resources/idlharness.js></script>
 <script>
-var t = async_test("Tests that the video MediaStreamTrack objects are properly initialized", {timeout:10000});
-var track = null
-var idl_array = new IdlArray();
-
-idl_array.add_idls("interface EventTarget {\
-  void addEventListener(DOMString type, EventListener? callback, optional boolean capture = false);\
-  void removeEventListener(DOMString type, EventListener? callback, optional boolean capture = false);\
-  boolean dispatchEvent(Event event);\
-};");
-
-idl_array.add_idls("interface MediaStreamTrack : EventTarget {\
-    readonly    attribute DOMString             kind;\
-    readonly    attribute DOMString             id;\
-    readonly    attribute DOMString             label;\
-                attribute boolean               enabled;\
-    readonly    attribute boolean               muted;\
-                attribute EventHandler          onmute;\
-                attribute EventHandler          onunmute;\
-    readonly    attribute MediaStreamTrackState readyState;\
-                attribute EventHandler          onended;\
-                attribute EventHandler          onoverconstrained;\
-    MediaStreamTrack       clone ();\
-    void                   stop ();\
-    MediaTrackCapabilities getCapabilities ();\
-    MediaTrackConstraints  getConstraints ();\
-    MediaTrackSettings     getSettings ();\
-    Promise<void>          applyConstraints (optional MediaTrackConstraints constraints);\
-};");
-
-t.step(function () {
-  navigator.mediaDevices.getUserMedia({video: true})
-    .then(t.step_func(function (stream) {
+promise_test(() => {
+  return navigator.mediaDevices.getUserMedia({video: true})
+    .then(stream => {
       var videoTracks = stream.getVideoTracks();
       assert_equals(videoTracks.length, 1, "There is exactly one video track in the media stream");
       track = videoTracks[0];
-      idl_array.add_objects({MediaStreamTrack: ["track"]});
-      idl_array.test();
       assert_equals(track.readyState, "live", "The track object is in live state");
       assert_equals(track.kind, "video", "The track object is of video kind");
       // Not clear that this is required by the spec,
       // see https://www.w3.org/Bugs/Public/show_bug.cgi?id=22212
       assert_true(track.enabled, "The track object is enabed");
-      t.done();
-    }));
+    });
 });
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/OWNERS b/tests/wpt/web-platform-tests/mediacapture-streams/OWNERS
index 2fec44486be0d..25688fa7c9b27 100644
--- a/tests/wpt/web-platform-tests/mediacapture-streams/OWNERS
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/OWNERS
@@ -1,3 +1,5 @@
 @agouaillard
 @alvestrand
 @dontcallmedom
+@eric-carlson
+@youennf
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
deleted file mode 100644
index 742363922fb02..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "form-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
deleted file mode 100644
index 3f781b8201a77..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "form-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
deleted file mode 100644
index f584e0be95a77..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
deleted file mode 100644
index eb24a71a7969f..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
deleted file mode 100644
index 8452988259ba3..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "form-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
deleted file mode 100644
index 148a6ec880db0..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
deleted file mode 100644
index a640ddee7d93f..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "form-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
deleted file mode 100644
index 48f005a386ebd..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/form-tag/top-level/no-redirect/allowed.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "form-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
deleted file mode 100644
index f44a0b54d66a0..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
deleted file mode 100644
index 9cd4f1ba42167..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 277d478918069..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 582ed6012b1ba..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 37d4db54b4918..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
deleted file mode 100644
index b4957a41eb176..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
deleted file mode 100644
index e910a0ab7be41..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 1f8763010f025..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 6d67e4d0e407c..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 0d8b5ebdbd10d..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 326ca747cb42f..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 35e3102a5dd53..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
deleted file mode 100644
index eaa1cc5d72924..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
deleted file mode 100644
index ff99ecf9bbd05..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 2ea8aadcaa365..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 2aa9e013bb108..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
deleted file mode 100644
index b5dcde734a4e7..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
deleted file mode 100644
index 1fb7a9385a6c2..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index aaeaf76737f33..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index a649f4de48411..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index fa1d0fe9094c9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index 0dad760aad33a..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index ed11ad73e8d90..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index de84e1278b66f..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index 45a2764ade60f..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index 09e948a84b586..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index f72d269d11ea9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: form-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "form-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index a69f2bb412e6a..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index f98fe6c4cdfd1..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/no-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
deleted file mode 100644
index b891c73e81720..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: iframe-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "iframe-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/fetch-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/fetch-request/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/common.js b/tests/wpt/web-platform-tests/mixed-content/generic/common.js
index 36427a4669fa0..d04aabcfcd2a0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/common.js
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/common.js
@@ -50,9 +50,9 @@ function xhrRequest(url, responseType) {
 
     xhr.addEventListener("load", function() {
       if (xhr.status != 200)
-        return reject(Error(xhr.statusText));
-
-      resolve(xhr.response);
+        reject(Error(xhr.statusText));
+      else
+        resolve(xhr.response);
     });
 
     xhr.send();
@@ -99,7 +99,7 @@ function bindEvents(element, resolveEventName, rejectEventName) {
  *     {@code eventPromise} property. Default value evaluates to false.
  * @return {DOMElement} The newly created DOM element.
  */
-function createElement(tagName, attrs, parent, doBindEvents) {
+function createElement(tagName, attrs, parentNode, doBindEvents) {
   var element = document.createElement(tagName);
 
   if (doBindEvents)
@@ -117,8 +117,8 @@ function createElement(tagName, attrs, parent, doBindEvents) {
   if (!isImg)
     setAttributes(element, attrs);
 
-  if (parent)
-    parent.appendChild(element);
+  if (parentNode)
+    parentNode.appendChild(element);
 
   if (isImg)
     setAttributes(element, attrs);
@@ -126,8 +126,8 @@ function createElement(tagName, attrs, parent, doBindEvents) {
   return element;
 }
 
-function createRequestViaElement(tagName, attrs, parent) {
-  return createElement(tagName, attrs, parent, true).eventPromise;
+function createRequestViaElement(tagName, attrs, parentNode) {
+  return createElement(tagName, attrs, parentNode, true).eventPromise;
 }
 
 /**
@@ -189,7 +189,12 @@ function requestViaFetch(url) {
  * @return {Promise} The promise for success/error events.
  */
 function requestViaWorker(url) {
-  var worker = new Worker(url);
+  var worker;
+  try {
+    worker = new Worker(url);
+  } catch (e) {
+    return Promise.reject(e);
+  }
   bindEvents(worker, "message", "error");
   worker.postMessage('');
 
@@ -304,16 +309,20 @@ function requestViaLinkPrefetch(url) {
  */
 function createMediaElement(type, media_attrs, source_attrs) {
   var mediaElement = createElement(type, {});
-  var sourceElement = createElement("source", {}, mediaElement);
+
+  var sourceElement = createElement("source", {});
 
   mediaElement.eventPromise = new Promise(function(resolve, reject) {
     mediaElement.addEventListener("loadeddata", resolve);
+
     // Notice that the source element will raise the error.
     sourceElement.addEventListener("error", reject);
   });
 
   setAttributes(mediaElement, media_attrs);
   setAttributes(sourceElement, source_attrs);
+
+  mediaElement.appendChild(sourceElement);
   document.body.appendChild(mediaElement);
 
   return mediaElement;
@@ -328,7 +337,7 @@ function createMediaElement(type, media_attrs, source_attrs) {
 function requestViaVideo(url) {
   return createMediaElement("video",
                             {},
-                            {type: "video/mp4", src: url}).eventPromise;
+                            {type: "video/ogg", src: url}).eventPromise;
 }
 
 /**
@@ -340,7 +349,7 @@ function requestViaVideo(url) {
 function requestViaAudio(url) {
   return createMediaElement("audio",
                             {},
-                            {type: "audio/mpeg", src: url}).eventPromise;
+                            {type: "audio/wav", src: url}).eventPromise;
 }
 
 /**
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/expect.py b/tests/wpt/web-platform-tests/mixed-content/generic/expect.py
index a3ea61b21392e..672a54c3a6ebf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/expect.py
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/expect.py
@@ -71,14 +71,13 @@ def main(request, response):
                 response_data = open(os.path.join(request.doc_root,
                                                   "images",
                                                   "smiley.png"), "rb").read()
-            elif content_type == "audio/mpeg":
+            elif content_type == "audio/wav":
                 response_data = open(os.path.join(request.doc_root,
-                                                  "media",
-                                                  "sound_5.oga"), "rb").read()
-            elif content_type == "video/mp4":
+                                                  "webaudio", "resources", "sin_440Hz_-6dBFS_1s.wav"), "rb").read()
+            elif content_type == "video/ogg":
                 response_data = open(os.path.join(request.doc_root,
                                                   "media",
-                                                  "movie_5.mp4"), "rb").read()
+                                                  "movie_5.ogv"), "rb").read()
             elif content_type == "application/javascript":
                 response_data = open(os.path.join(request.doc_root,
                                                   "mixed-content",
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js b/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
index 7f3a7bfa96782..1dcf27eb4e578 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
@@ -88,8 +88,8 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
     "script-tag": "text/javascript",
     "worker-request": "application/javascript",
     "xhr-request": "application/json",
-    "audio-tag": "audio/mpeg",
-    "video-tag": "video/mp4",
+    "audio-tag": "audio/wav",
+    "video-tag": "video/ogg",
     "picture-tag": "image/png",
     "object-tag": "text/html",
     "link-css-tag": "text/css",
@@ -119,12 +119,12 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
                              contentType[scenario.subresource];
 
     xhrRequest(announceResourceRequestUrl)
-      .then(function(response) {
+      .then(mixed_content_test.step_func(_ => {
         // Send out the real resource request.
         // This should tear down the key if it's not blocked.
         return resourceMap[scenario.subresource](resourceRequestUrl);
-      })
-      .then(function() {
+      }))
+      .then(mixed_content_test.step_func(_ => {
         mixed_content_test.step(function() {
           assert_equals("allowed", scenario.expectation,
                         "The triggered event should match '" +
@@ -133,7 +133,8 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
 
         // Send request to check if the key has been torn down.
         return xhrRequest(assertResourceRequestUrl);
-      }, function(error) {
+      }))
+      .catch(mixed_content_test.step_func(e => {
         mixed_content_test.step(function() {
           assert_equals("blocked", scenario.expectation,
                         "The triggered event should match '" +
@@ -145,19 +146,15 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
 
         // When requestResource fails, we also check the key state.
         return xhrRequest(assertResourceRequestUrl);
-      })
-      .then(function(response) {
+      }))
+      .then(mixed_content_test.step_func_done(response => {
          // Now check if the value has been torn down. If it's still there,
          // we have blocked the request to mixed-content.
-         mixed_content_test.step(function() {
-           assert_equals(response.status, scenario.expectation,
-                  "The resource request should be '" + scenario.expectation +
-                  "'.");
-         }, "Check if request was sent.");
-         mixed_content_test.done();
-      });
+         assert_equals(response.status, scenario.expectation,
+           "The resource request should be '" + scenario.expectation + "'.");
+      }));
 
   }  // runTest
 
-  return {start: runTest};
+  return {start: mixed_content_test.step_func(runTest) };
 }  // MixedContentTestCase
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/tools/clean.py b/tests/wpt/web-platform-tests/mixed-content/generic/tools/clean.py
index 9416f0b5bd95b..15f294b5c8c87 100755
--- a/tests/wpt/web-platform-tests/mixed-content/generic/tools/clean.py
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/tools/clean.py
@@ -8,7 +8,6 @@ def rmtree(top):
     top = os.path.abspath(top)
     assert top != os.path.expanduser("~")
     assert len(top) > len(os.path.expanduser("~"))
-    assert "web-platform-tests" in top
     assert "mixed-content" in top
 
     for root, dirs, files in os.walk(top, topdown=False):
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py b/tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py
index 5c2807d2834fe..0bf41f2d1c6d3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py
@@ -13,13 +13,14 @@
 spec_filename = os.path.join(spec_directory, "spec.src.json")
 generated_spec_json_filename = os.path.join(spec_directory, "spec_json.js")
 
-selection_pattern = '%(opt_in_method)s/' + \
+selection_pattern = '%(subresource)s/' + \
+                    '%(opt_in_method)s/' + \
                     '%(origin)s/' + \
-                    '%(subresource)s/' + \
                     '%(context_nesting)s/' + \
                     '%(redirection)s/'
 
-test_file_path_pattern = '%(spec_name)s/' + selection_pattern + \
+test_file_path_pattern = selection_pattern + \
+                         '%(spec_name)s/' + \
                          '%(name)s.%(source_scheme)s.html'
 
 
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/iframe-tag/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/fetch-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/iframe-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-css-tag/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/object-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
deleted file mode 100644
index 46e2255e388e9..0000000000000
--- a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/script-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/object-tag/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/script-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/script-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/script-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/spec.src.json b/tests/wpt/web-platform-tests/mixed-content/spec.src.json
index 3f1540ab4083b..536646d3cea28 100644
--- a/tests/wpt/web-platform-tests/mixed-content/spec.src.json
+++ b/tests/wpt/web-platform-tests/mixed-content/spec.src.json
@@ -231,10 +231,8 @@
     ],
     "subresource": {
       "blockable": [
-        "iframe-tag",
         "script-tag",
         "link-css-tag",
-        "form-tag",
         "xhr-request",
         "worker-request",
         "fetch-request",
diff --git a/tests/wpt/web-platform-tests/mixed-content/spec_json.js b/tests/wpt/web-platform-tests/mixed-content/spec_json.js
index 5de1b17e303d8..44012ee40ab52 100644
--- a/tests/wpt/web-platform-tests/mixed-content/spec_json.js
+++ b/tests/wpt/web-platform-tests/mixed-content/spec_json.js
@@ -1 +1 @@
-var SPEC_JSON = {"test_expansion_schema": {"origin": ["same-host-https", "same-host-http", "cross-origin-https", "cross-origin-http", "same-host-wss", "same-host-ws", "cross-origin-wss", "cross-origin-ws"], "subresource": {"blockable": ["iframe-tag", "script-tag", "link-css-tag", "form-tag", "xhr-request", "worker-request", "fetch-request", "a-tag", "object-tag", "picture-tag", "websocket-request"], "optionally-blockable": ["img-tag", "audio-tag", "video-tag", "link-prefetch-tag"]}, "context_nesting": ["top-level", "sub-level"], "expectation": ["allowed", "blocked"], "expansion": ["default", "override"], "redirection": ["no-redirect", "keep-scheme-redirect", "swap-scheme-redirect"], "opt_in_method": ["no-opt-in", "http-csp", "meta-csp", "img-crossorigin"], "source_scheme": ["http", "https"]}, "specification": [{"test_expansion": [{"origin": ["cross-origin-http", "same-host-http"], "name": "opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}, {"origin": ["cross-origin-http", "same-host-http"], "name": "no-opt-in-allows", "redirection": "*", "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "no-opt-in", "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}], "description": "Test behavior of optionally-blockable content", "specification_url": "http://www.w3.org/TR/mixed-content/#category-optionally-blockable", "name": "optionally-blockable", "title": "Optionally-blockable content"}, {"test_expansion": [{"origin": ["cross-origin-http", "same-host-http"], "name": "opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"origin": ["cross-origin-http", "same-host-http"], "name": "no-opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "no-opt-in", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"origin": ["cross-origin-ws", "same-host-ws"], "name": "ws-downgrade-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["no-opt-in", "http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": "websocket-request", "optionally-blockable": []}}], "description": "Test behavior of blockable content.", "specification_url": "http://www.w3.org/TR/mixed-content/#category-blockable", "name": "blockable", "title": "Blockable content"}, {"test_expansion": [{"origin": ["same-host-https"], "name": "allowed", "redirection": ["no-redirect", "keep-scheme-redirect"], "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"origin": ["same-host-wss"], "name": "websocket-allowed", "redirection": ["no-redirect", "keep-scheme-redirect"], "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "*", "source_scheme": "https", "subresource": {"blockable": "websocket-request", "optionally-blockable": []}}], "description": "Test behavior of allowed content.", "specification_url": "http://www.w3.org/TR/mixed-content/", "name": "allowed", "title": "Allowed content"}], "excluded_tests": [{"origin": "*", "name": "Redundant-subresources", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "*", "source_scheme": "*", "subresource": {"blockable": ["a-tag"], "optionally-blockable": []}}, {"origin": ["same-host-https", "same-host-http", "cross-origin-https", "cross-origin-http"], "name": "Skip-origins-not-applicable-to-websockets", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "*", "source_scheme": "*", "subresource": {"blockable": ["websocket-request"], "optionally-blockable": []}}, {"origin": "*", "name": "TODO-opt-in-method-img-cross-origin", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "img-crossorigin", "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"origin": "*", "name": "Skip-redundant-for-opt-in-method", "redirection": ["keep-scheme-redirect", "swap-scheme-redirect"], "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": ["meta-csp", "img-crossorigin"], "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}]};
+var SPEC_JSON = {"test_expansion_schema": {"origin": ["same-host-https", "same-host-http", "cross-origin-https", "cross-origin-http", "same-host-wss", "same-host-ws", "cross-origin-wss", "cross-origin-ws"], "subresource": {"blockable": ["script-tag", "link-css-tag", "xhr-request", "worker-request", "fetch-request", "a-tag", "object-tag", "picture-tag", "websocket-request"], "optionally-blockable": ["img-tag", "audio-tag", "video-tag", "link-prefetch-tag"]}, "context_nesting": ["top-level", "sub-level"], "expectation": ["allowed", "blocked"], "expansion": ["default", "override"], "redirection": ["no-redirect", "keep-scheme-redirect", "swap-scheme-redirect"], "opt_in_method": ["no-opt-in", "http-csp", "meta-csp", "img-crossorigin"], "source_scheme": ["http", "https"]}, "specification": [{"test_expansion": [{"origin": ["cross-origin-http", "same-host-http"], "name": "opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}, {"origin": ["cross-origin-http", "same-host-http"], "name": "no-opt-in-allows", "redirection": "*", "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "no-opt-in", "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}], "description": "Test behavior of optionally-blockable content", "specification_url": "http://www.w3.org/TR/mixed-content/#category-optionally-blockable", "name": "optionally-blockable", "title": "Optionally-blockable content"}, {"test_expansion": [{"origin": ["cross-origin-http", "same-host-http"], "name": "opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"origin": ["cross-origin-http", "same-host-http"], "name": "no-opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "no-opt-in", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"origin": ["cross-origin-ws", "same-host-ws"], "name": "ws-downgrade-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["no-opt-in", "http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": "websocket-request", "optionally-blockable": []}}], "description": "Test behavior of blockable content.", "specification_url": "http://www.w3.org/TR/mixed-content/#category-blockable", "name": "blockable", "title": "Blockable content"}, {"test_expansion": [{"origin": ["same-host-https"], "name": "allowed", "redirection": ["no-redirect", "keep-scheme-redirect"], "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"origin": ["same-host-wss"], "name": "websocket-allowed", "redirection": ["no-redirect", "keep-scheme-redirect"], "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "*", "source_scheme": "https", "subresource": {"blockable": "websocket-request", "optionally-blockable": []}}], "description": "Test behavior of allowed content.", "specification_url": "http://www.w3.org/TR/mixed-content/", "name": "allowed", "title": "Allowed content"}], "excluded_tests": [{"origin": "*", "name": "Redundant-subresources", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "*", "source_scheme": "*", "subresource": {"blockable": ["a-tag"], "optionally-blockable": []}}, {"origin": ["same-host-https", "same-host-http", "cross-origin-https", "cross-origin-http"], "name": "Skip-origins-not-applicable-to-websockets", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "*", "source_scheme": "*", "subresource": {"blockable": ["websocket-request"], "optionally-blockable": []}}, {"origin": "*", "name": "TODO-opt-in-method-img-cross-origin", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "img-crossorigin", "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"origin": "*", "name": "Skip-redundant-for-opt-in-method", "redirection": ["keep-scheme-redirect", "swap-scheme-redirect"], "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": ["meta-csp", "img-crossorigin"], "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}]};
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/keep-scheme-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/no-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-ws/websocket-request/top-level/swap-scheme-redirect/ws-downgrade-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/keep-scheme-redirect/websocket-allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-wss/websocket-request/top-level/no-redirect/websocket-allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/worker-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/script-tag/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/worker-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/worker-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/worker-request/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/keep-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/http-csp/same-host-http/xhr-request/top-level/swap-scheme-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.headers
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/cross-origin-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/meta-csp/same-host-http/xhr-request/top-level/no-redirect/opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/meta-csp/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/cross-origin-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/no-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/blockable/no-opt-in/same-host-http/xhr-request/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/keep-scheme-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/mixed-content/allowed/no-opt-in/same-host-https/xhr-request/top-level/no-redirect/allowed.https.html
rename to tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor_insecure_context.html b/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor_insecure_context.html
index 41efb8f023aa1..18d41cec9eef5 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor_insecure_context.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor_insecure_context.html
@@ -15,7 +15,7 @@ <h2>Note:</h2>
 </ol>
 <script>
 
-runGenericSensorInsecureContext(AbsoluteOrientationSensor);
-runGenericSensorInsecureContext(RelativeOrientationSensor);
+runGenericSensorInsecureContext("AbsoluteOrientationSensor");
+runGenericSensorInsecureContext("RelativeOrientationSensor");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/idlharness.https.html b/tests/wpt/web-platform-tests/orientation-sensor/idlharness.https.html
index 82ab9b3851b38..44c16081cc13a 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/idlharness.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/idlharness.https.html
@@ -24,6 +24,7 @@
 [SecureContext, Exposed=Window]
 interface Sensor : EventTarget {
   readonly attribute boolean activated;
+  readonly attribute boolean hasReading;
   readonly attribute DOMHighResTimeStamp? timestamp;
   void start();
   void stop();
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_support.js b/tests/wpt/web-platform-tests/pointerevents/pointerevent_support.js
index 33f266754620f..0ed40101f37dc 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_support.js
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_support.js
@@ -155,14 +155,14 @@ function updateDescriptionComplete() {
 }
 
 function updateDescriptionSecondStepTouchActionElement(target, scrollReturnInterval) {
-    window.setTimeout(function() {
+    window.step_timeout(function() {
     objectScroller(target, 'up', 0);}
     , scrollReturnInterval);
     document.getElementById('desc').innerHTML = "Test Description: Try to scroll element RIGHT moving your outside of the red border";
 }
 
 function updateDescriptionThirdStepTouchActionElement(target, scrollReturnInterval) {
-    window.setTimeout(function() {
+    window.step_timeout(function() {
     objectScroller(target, 'left', 0);}
     , scrollReturnInterval);
     document.getElementById('desc').innerHTML = "Test Description: Try to scroll element DOWN then RIGHT starting your touch inside of the element. Then tap complete button";
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html b/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html
new file mode 100644
index 0000000000000..478a7ce6fe6aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Referrer Policy: iframes correctly inherit the ancestor's referrer</title>
+    <link rel="author" title="Jochen Eisinger" href="mailto:jochen@chromium.org">
+    <link rel="help" href="https://www.w3.org/TR/referrer-policy/#referrer-policy-delivery-nested">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- Common global functions for referrer-policy tests. -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <meta name="referrer" content="origin">
+  </head>
+  <body onload="runTest()">
+    <h1>Referrer Policy: iframes correctly inherit the ancestor's referrer</h1>
+    <script>
+      var test = async_test("iframes correctly inherit the ancestor's referrer");
+      window.addEventListener("message", test.step_func((msg) => {
+        assert_equals(msg.data.referrer, document.location.origin + "/");
+        test.done();
+      }));
+
+      function runTest() {
+        var iframe = document.createElement("iframe");
+        iframe.src = "about:blank";
+        document.body.appendChild(iframe);
+        iframe.contentDocument.write(`
+            <script src = "/referrer-policy/generic/common.js"></` + `script>
+            <script>
+              var urlPath = "/referrer-policy/generic/subresource/xhr.py";
+              var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
+              queryXhr(url, (msg) => {
+                  parent.postMessage({referrer: msg.referrer}, "*")});
+            </` + "script>");
+        }
+      </script>
+
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-timeout-with-raf.html b/tests/wpt/web-platform-tests/requestidlecallback/callback-timeout-when-busy.html
similarity index 68%
rename from tests/wpt/web-platform-tests/requestidlecallback/callback-timeout-with-raf.html
rename to tests/wpt/web-platform-tests/requestidlecallback/callback-timeout-when-busy.html
index 54339dcc01b9c..adf07408fb7b7 100644
--- a/tests/wpt/web-platform-tests/requestidlecallback/callback-timeout-with-raf.html
+++ b/tests/wpt/web-platform-tests/requestidlecallback/callback-timeout-when-busy.html
@@ -8,27 +8,27 @@
 async_test(function() {
   // Check whether requestIdleCallback with a timeout works when the event loop
   // is busy.
-  var busy_raf_loop_iterations_remaining = 10;  // Should take 20 * 40 = 400ms
+  var busy_loop_iterations_remaining = 10;  // Should take 20 * 40 = 400ms
   var idle_callback_scheduled;
   var idle_callback = this.step_func_done(function(deadline) {
     assert_false(deadline.didTimeout, "IdleDeadline.didTimeout MUST be false if requestIdleCallback wasn't scheduled due to a timeout");
-    assert_equals(busy_raf_loop_iterations_remaining, 0, "Busy rAF loop should be finished by the time we get scheduled");
+    assert_equals(busy_loop_iterations_remaining, 0, "Busy event loop should be finished by the time we get scheduled");
   });
 
-  var busy_raf_loop_iterations_remaining = 10;  // Should take 20 * 40 = 400ms
-  requestAnimationFrame(this.step_func(function busyRAFLoop() {
+  var busy_loop_iterations_remaining = 10;  // Should take 20 * 40 = 400ms
+  step_timeout(this.step_func(function busyLoop() {
     var start_time = performance.now();
     if (!idle_callback_scheduled) {
       idle_callback_scheduled = start_time;
       requestIdleCallback(idle_callback);
     }
 
-    // Use up the whole frame budget.
+    // Use up more than a frames worth of budget.
     while (performance.now() - start_time < 40) {
     }
-    if (busy_raf_loop_iterations_remaining > 0) {
-      busy_raf_loop_iterations_remaining--;
-      requestAnimationFrame(busyRAFLoop);
+    if (busy_loop_iterations_remaining > 0) {
+      busy_loop_iterations_remaining--;
+      step_timeout(busyLoop);
     }
   }));
 }, 'requestIdleCallback not scheduled when event loop is busy.');
@@ -36,7 +36,7 @@
 async_test(function() {
   // Check whether requestIdleCallback with a timeout works when the event loop
   // is busy.
-  var busy_raf_loop_iterations_remaining = 10;  // Should take 20 * 40 = 400ms
+  var busy_loop_iterations_remaining = 10;  // Should take 20 * 40 = 400ms
   var timeout = 200;
   var idle_callback_scheduled;
   var idle_callback = this.step_func_done(function(deadline) {
@@ -44,22 +44,22 @@
     assert_true(time_delta >= timeout, "Should only have been run after timeout");
     assert_true(deadline.timeRemaining() == 0, "IdleDeadline.timeRemaining MUST be equal to zero if requestIdleCallback was scheduled due to a timeout");
     assert_true(deadline.didTimeout, "IdleDeadline.didTimeout MUST be true if requestIdleCallback was scheduled due to a timeout");
-    assert_true(busy_raf_loop_iterations_remaining > 0, "Busy rAF loop should still be going");
+    assert_true(busy_loop_iterations_remaining > 0, "Busy event loop should still be going");
   });
 
-  requestAnimationFrame(this.step_func(function busyRAFLoop() {
+  step_timeout(this.step_func(function busyLoop() {
     var start_time = performance.now();
     if (!idle_callback_scheduled) {
       idle_callback_scheduled = start_time;
       requestIdleCallback(idle_callback, { timeout: timeout });
     }
 
-    // Use up the whole frame budget.
+    // Use up more than a frames worth of budget.
     while (performance.now() - start_time < 40) {
     }
-    if (busy_raf_loop_iterations_remaining > 0) {
-      busy_raf_loop_iterations_remaining--;
-      requestAnimationFrame(busyRAFLoop);
+    if (busy_loop_iterations_remaining > 0) {
+      busy_loop_iterations_remaining--;
+      step_timeout(busyLoop);
     }
   }));
 }, 'requestIdleCallback scheduled with timeout when event loop is busy.');
diff --git a/tests/wpt/web-platform-tests/requestidlecallback/idlharness.html b/tests/wpt/web-platform-tests/requestidlecallback/idlharness.html
index 6033535f397aa..4007d09fec356 100644
--- a/tests/wpt/web-platform-tests/requestidlecallback/idlharness.html
+++ b/tests/wpt/web-platform-tests/requestidlecallback/idlharness.html
@@ -23,6 +23,11 @@
   unsigned long timeout;
 };
 
+[Exposed=Window] interface IdleDeadline {
+  DOMHighResTimeStamp timeRemaining();
+  readonly attribute boolean didTimeout;
+};
+
 callback IdleRequestCallback = void (IdleDeadline deadline);
 </pre>
 <script>
@@ -30,5 +35,19 @@
   idl_array.add_untested_idls(document.getElementById("untested_idl").textContent);
   idl_array.add_idls(document.getElementById("idl").textContent);
   idl_array.add_objects({Window: ["window"]});
-  idl_array.test();
+
+  async_test(function() {
+    var rIC = this.step_func(function(deadline) {
+      idl_array.add_objects({IdleDeadline: [deadline]});
+      idl_array.test();
+      this.done();
+    });
+    if (window.requestIdleCallback) {
+      requestIdleCallback(rIC);
+    } else {
+      idl_array.test();
+      assert_unreached("IdleDeadline not supported");
+      this.done();
+    }
+  }, "IdleDeadline object setup");
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox-1/support/check-layout-th.js b/tests/wpt/web-platform-tests/resources/check-layout-th.js
similarity index 95%
rename from tests/wpt/web-platform-tests/css/css-flexbox-1/support/check-layout-th.js
rename to tests/wpt/web-platform-tests/resources/check-layout-th.js
index 07f7d5ded829e..9b83df74ef2a7 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox-1/support/check-layout-th.js
+++ b/tests/wpt/web-platform-tests/resources/check-layout-th.js
@@ -69,6 +69,11 @@ function checkExpectedValues(t, node, prefix)
         assert_tolerance(node.scrollHeight, expectedHeight, prefix + "scrollHeight");
     }
 
+    var expectedWidth = checkAttribute(output, node, "data-expected-bounding-client-rect-width");
+    if (expectedWidth) {
+        assert_tolerance(node.getBoundingClientRect().width, expectedWidth, prefix + "getBoundingClientRect().width");
+    }
+
     var expectedOffset = checkAttribute(output, node, "data-total-x");
     if (expectedOffset) {
         var totalLeft = node.clientLeft + node.offsetLeft;
@@ -156,14 +161,15 @@ function checkExpectedValues(t, node, prefix)
     return output.checked;
 }
 
-window.checkLayout = function(selectorList, outputContainer)
+var testNumber = 0;
+
+window.checkLayout = function(selectorList, callDone = true)
 {
     if (!selectorList) {
         console.error("You must provide a CSS selector of nodes to check.");
         return;
     }
     var nodes = document.querySelectorAll(selectorList);
-    var testNumber = 0;
     nodes = Array.prototype.slice.call(nodes);
     nodes.reverse();
     var checkedLayout = false;
@@ -184,7 +190,8 @@ window.checkLayout = function(selectorList, outputContainer)
     if (!checkedLayout) {
         console.error("No valid data-* attributes found in selector list : " + selectorList);
     }
-    done();
+    if (callDone)
+        done();
 };
 
 })();
diff --git a/tests/wpt/web-platform-tests/resources/idlharness.js b/tests/wpt/web-platform-tests/resources/idlharness.js
index eda6a420dd6ea..587325c3aea37 100644
--- a/tests/wpt/web-platform-tests/resources/idlharness.js
+++ b/tests/wpt/web-platform-tests/resources/idlharness.js
@@ -167,11 +167,11 @@ self.IdlArray = function()
 };
 
 //@}
-IdlArray.prototype.add_idls = function(raw_idls)
+IdlArray.prototype.add_idls = function(raw_idls, options)
 //@{
 {
     /** Entry point.  See documentation at beginning of file. */
-    this.internal_add_idls(WebIDL2.parse(raw_idls));
+    this.internal_add_idls(WebIDL2.parse(raw_idls), options);
 };
 
 //@}
@@ -195,27 +195,60 @@ IdlArray.prototype.add_untested_idls = function(raw_idls)
 };
 
 //@}
-IdlArray.prototype.internal_add_idls = function(parsed_idls)
+IdlArray.prototype.internal_add_idls = function(parsed_idls, options)
 //@{
 {
     /**
      * Internal helper called by add_idls() and add_untested_idls().
+     *
      * parsed_idls is an array of objects that come from WebIDLParser.js's
      * "definitions" production.  The add_untested_idls() entry point
      * additionally sets an .untested property on each object (and its
      * .members) so that they'll be skipped by test() -- they'll only be
      * used for base interfaces of tested interfaces, return types, etc.
+     *
+     * options is a dictionary that can have an only or except member which are
+     * arrays. If only is given then only members, partials and interface
+     * targets listed will be added, and if except is given only those that
+     * aren't listed will be added. Only one of only and except can be used.
      */
+
+    if (options && options.only && options.except)
+    {
+        throw "The only and except options can't be used together."
+    }
+
+    function should_skip(name)
+    {
+        if (options && options.only && options.only.indexOf(name) == -1)
+        {
+            return true;
+        }
+        if (options && options.except && options.except.indexOf(name) != -1)
+        {
+            return true;
+        }
+        return false;
+    }
+
     parsed_idls.forEach(function(parsed_idl)
     {
         if (parsed_idl.type == "interface" && parsed_idl.partial)
         {
+            if (should_skip(parsed_idl.name))
+            {
+                return;
+            }
             this.partials.push(parsed_idl);
             return;
         }
 
         if (parsed_idl.type == "implements")
         {
+            if (should_skip(parsed_idl.target))
+            {
+                return;
+            }
             if (!(parsed_idl.target in this["implements"]))
             {
                 this["implements"][parsed_idl.target] = [];
@@ -229,6 +262,10 @@ IdlArray.prototype.internal_add_idls = function(parsed_idls)
         {
             throw "Duplicate identifier " + parsed_idl.name;
         }
+        if (should_skip(parsed_idl.name))
+        {
+            return;
+        }
         switch(parsed_idl.type)
         {
         case "interface":
diff --git a/tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.html b/tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.html
index 737f31b1dcfd3..581d761f5e795 100644
--- a/tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.html
+++ b/tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.html
@@ -25,13 +25,19 @@
         assert_unreached("isSecureContext should be supported");
       });
 
-      var w2 = new Worker(https_dir + "support/dedicated-worker-script.js");
-      w2.onmessage = t2.step_func_done(function(e) {
-        assert_unreached("cross-origin workers should not be loaded");
-      });
-      w2.onerror = t2.step_func_done(function(e) {
-        e.preventDefault();
-      });
+      try {
+        var w2 = new Worker(https_dir + "support/dedicated-worker-script.js");
+        w2.onmessage = t2.step_func_done(function(e) {
+          assert_unreached("cross-origin workers should not be loaded");
+        });
+        w2.onerror = t2.step_func_done(function(e) {
+          e.preventDefault();
+        });
+      } catch (e) {
+        // Some browsers throw for cross-origin URLs. This violates the Worker spec,
+        // but isn't actually relevant to what we're testing here.
+        t2.done();
+      }
 
       var w3 = new Worker(http_dir + "support/parent-dedicated-worker-script.js");
       w3.onmessage = t3.step_func_done(function(e) {
@@ -41,13 +47,19 @@
         assert_unreached("isSecureContext should be supported");
       });
 
-      var w4 = new Worker(https_dir + "support/parent-dedicated-worker-script.js");
-      w4.onmessage = t4.step_func_done(function(e) {
-        assert_unreached("cross-origin workers should not be loaded");
-      });
-      w4.onerror = t4.step_func_done(function(e) {
-        e.preventDefault();
-      });
+      try {
+        var w4 = new Worker(https_dir + "support/parent-dedicated-worker-script.js");
+        w4.onmessage = t4.step_func_done(function(e) {
+          assert_unreached("cross-origin workers should not be loaded");
+        });
+        w4.onerror = t4.step_func_done(function(e) {
+          e.preventDefault();
+        });
+      } catch (e) {
+        // Some browsers throw for cross-origin URLs. This violates the Worker spec,
+        // but isn't actually relevant to what we're testing here.
+        t4.done();
+      }
 
       onmessage = function(e) {
         var data = e.data;
diff --git a/tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.https.html b/tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.https.html
index 012c7b1da16de..e794755cdf91d 100644
--- a/tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.https.html
+++ b/tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.https.html
@@ -17,13 +17,19 @@
       var t5 = async_test("HTTP worker from HTTPS subframe");
       var t6 = async_test("HTTPS worker from HTTPS subframe");
 
-      var w1 = new Worker(http_dir + "support/dedicated-worker-script.js");
-      w1.onmessage = t1.step_func_done(function(e) {
-        assert_unreached("cross-origin workers should not be loaded");
-      });
-      w1.onerror = t1.step_func_done(function(e) {
-        e.preventDefault();
-      });
+      try {
+        var w1 = new Worker(http_dir + "support/dedicated-worker-script.js");
+        w1.onmessage = t1.step_func_done(function(e) {
+          assert_unreached("cross-origin workers should not be loaded");
+        });
+        w1.onerror = t1.step_func_done(function(e) {
+          e.preventDefault();
+        });
+      } catch (e) {
+        // Some browsers throw for cross-origin URLs. This violates the Worker spec,
+        // but isn't actually relevant to what we're testing here.
+        t1.done();
+      }
 
       var w2 = new Worker(https_dir + "support/dedicated-worker-script.js");
       w2.onmessage = t2.step_func_done(function(e) {
@@ -33,13 +39,19 @@
         assert_unreached("isSecureContext should be supported");
       });
 
-      var w3 = new Worker(http_dir + "support/parent-dedicated-worker-script.js");
-      w3.onmessage = t3.step_func_done(function(e) {
-        assert_unreached("cross-origin workers should not be loaded");
-      });
-      w3.onerror = t3.step_func_done(function(e) {
-        e.preventDefault();
-      });
+      try {
+        var w3 = new Worker(http_dir + "support/parent-dedicated-worker-script.js");
+        w3.onmessage = t3.step_func_done(function(e) {
+          assert_unreached("cross-origin workers should not be loaded");
+        });
+        w3.onerror = t3.step_func_done(function(e) {
+          e.preventDefault();
+        });
+      } catch (e) {
+        // Some browsers throw for cross-origin URLs. This violates the Worker spec,
+        // but isn't actually relevant to what we're testing here.
+        t3.done();
+      }
 
       var w4 = new Worker(https_dir + "support/parent-dedicated-worker-script.js");
       w4.onmessage = t4.step_func_done(function(e) {
diff --git a/tests/wpt/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.https.js b/tests/wpt/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.https.js
index ebc9f2b1f14f5..7ca4edef8abf3 100644
--- a/tests/wpt/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.https.js
+++ b/tests/wpt/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.https.js
@@ -52,7 +52,8 @@ const eLoadInEverything        = eLoadInPopup | eLoadInUnsandboxedIframe | eLoad
 
 // Flags indicating if a document type is expected to be a Secure Context:
 const eSecureNo              = 1;
-const eSecureIfCreatorSecure = 2;
+const eSecureIfNewWindow     = 2;
+const eSecureIfCreatorSecure = 3;
 
 // Flags indicating how the result of a test is obtained:
 const eResultFromPostMessage       = 1;
@@ -69,7 +70,7 @@ const loadTypes = [
   new LoadType("an https: URI",
                eLoadInEverything,
                https_dir + "postMessage-helper.https.html",
-               eSecureIfCreatorSecure,
+               eSecureIfNewWindow,
                eResultFromPostMessage),
   new LoadType("a blob: URI",
                eLoadInEverything,
@@ -80,7 +81,7 @@ const loadTypes = [
                // popup not relevant:
                eLoadInUnsandboxedIframe | eLoadInSandboxedIframe,
                "<script>(opener||parent).postMessage(isSecureContext, '*')</script>",
-               eSecureIfCreatorSecure,
+               eSecureIfNewWindow,
                eResultFromPostMessage),
   new LoadType("a javascript: URI",
                // can't load in sandbox:
@@ -179,31 +180,39 @@ LoadTarget.prototype.load_and_get_result_for = function(loadType) {
                                 " loading " + loadType.desc)
   if (loadType.resultFrom == eResultFromExaminationSync) {
     let domTarget = this.open(loadType);
-    let result = domTarget instanceof Window ?
+    let isFrame = domTarget instanceof HTMLIFrameElement;
+    let result = !isFrame ?
           domTarget.isSecureContext : domTarget.contentWindow.isSecureContext;
     this.close(domTarget);
-    return Promise.resolve(result);
+    return Promise.resolve({ result: result, isFrame: isFrame});
   }
   let target = this;
   if (loadType.resultFrom == eResultFromExaminationOnLoad) {
     return new Promise(function(resolve, reject) {
       function handleLoad(event) {
-        let result = domTarget instanceof Window ?
+        clearTimeout(timer);
+        let isFrame = domTarget instanceof HTMLIFrameElement;
+        let result = !isFrame ?
               domTarget.isSecureContext : domTarget.contentWindow.isSecureContext;
         domTarget.removeEventListener("load", handleLoad);
         target.close(domTarget);
-        resolve(result);
+        resolve({ result: result, isFrame: isFrame});
       }
       let domTarget = target.open(loadType);
       domTarget.addEventListener("load", handleLoad, false);
+
+      // Some browsers don't fire `load` events for `about:blank`. That's weird, but it also
+      // isn't what we're testing here.
+      let timer = setTimeout(handleLoad, 500);
     });
   }
   if (loadType.resultFrom == eResultFromPostMessage) {
     return new Promise(function(resolve, reject) {
       function handleMessage(event) {
+        let isFrame = domTarget instanceof HTMLIFrameElement;
         window.removeEventListener("message", handleMessage);
         target.close(domTarget);
-        resolve(event.data);
+        resolve({ result: event.data, isFrame: isFrame});
       }
       window.addEventListener("message", handleMessage, false);
       let domTarget = target.open(loadType);
@@ -232,13 +241,21 @@ function run_next_test() {
     function(value) {
       run_next_test_soon();
       loadTarget.currentTest.step(function() {
+        // If the new context is always non-secure, the assertion is straightforward.
         if (loadType.expectedSecureFlag == eSecureNo) {
-          assert_false(value, loadType.desc + " in " + loadTarget.desc + " should not create a Secure Context");
-        } else if (loadType.expectedSecureFlag == eSecureIfCreatorSecure) {
+          assert_false(value.result, loadType.desc + " in " + loadTarget.desc + " should not create a Secure Context");
+        // If the new context is always secure if opened in a new window, and it's
+        // been opened in a new window, the assertion is likewise straightforward.
+        } else if (loadType.expectedSecureFlag == eSecureIfNewWindow && !value.isFrame) {
+          assert_true(value.result, loadType.desc + " in " + loadTarget.desc + " should create a secure context regardless of its creator's state.");
+        // Otherwise, we're either dealing with a context that's secure if and only
+        // if its creator context (e.g. this window) is secure.
+        } else if ((loadType.expectedSecureFlag == eSecureIfNewWindow && value.isFrame) ||
+                   (loadType.expectedSecureFlag == eSecureIfCreatorSecure)) {
           if (!window.isSecureContext) {
-            assert_false(value, loadType.desc + " in " + loadTarget.desc + " should not create a Secure Context when its creator is not a Secure Context.");
+            assert_false(value.result, loadType.desc + " in " + loadTarget.desc + " should not create a Secure Context when its creator is not a Secure Context.");
           } else {
-            assert_true(value, loadType.desc + " in " + loadTarget.desc + " should create a Secure Context when its creator is a Secure Context");
+            assert_true(value.result, loadType.desc + " in " + loadTarget.desc + " should create a Secure Context when its creator is a Secure Context");
           }
         } else {
           assert_unreached(loadType.desc + " - unknown expected secure flag: " + expectedSecureFlag);
diff --git a/tests/wpt/web-platform-tests/secure-contexts/shared-worker-secure-first.https.html b/tests/wpt/web-platform-tests/secure-contexts/shared-worker-secure-first.https.html
index 27697d620873f..ce97a628a0edc 100644
--- a/tests/wpt/web-platform-tests/secure-contexts/shared-worker-secure-first.https.html
+++ b/tests/wpt/web-platform-tests/secure-contexts/shared-worker-secure-first.https.html
@@ -46,15 +46,15 @@
           // one in the popup or in our subframe.
           if (data.fromPopup) {
             t3.step(function() {
-              assert_false(data.exception);
-              assert_true(data.error);
+              assert_false(data.exception, "No exception should be present.");
+              assert_true(data.error, "SharedWorker connection should error out.");
             });
             t3.done();
           } else {
             t1.step(function() {
-              assert_false(data.exception);
-              assert_false(data.error);
-              assert_true(data.isSecureContext);
+              assert_false(data.exception, "SharedWorker should not throw an exception.");
+              assert_false(data.error, "SharedWorker connection should not generate an error.");
+              assert_true(data.isSecureContext, "SharedWorker is a secure context");
             });
             t1.done();
           }
@@ -63,15 +63,15 @@
           // check whether it's the one in the popup or in our subframe.
           if (data.fromPopup) {
             t4.step(function() {
-              assert_false(data.exception);
-              assert_true(data.error);
+              assert_false(data.exception, "No exception should be present.");
+              assert_true(data.error, "SharedWorker connection should error out.");
             });
             t4.done();
           } else {
             t2.step(function() {
-              assert_false(data.exception);
-              assert_false(data.error);
-              assert_true(data.isSecureContext);
+              assert_false(data.exception, "SharedWorker should not throw an exception.");
+              assert_false(data.error, "SharedWorker connection should not generate an error.");
+              assert_true(data.isSecureContext, "SharedWorker is a secure context");
             });
             t2.done();
           }
diff --git a/tests/wpt/web-platform-tests/secure-contexts/support/https-subframe-dedicated.html b/tests/wpt/web-platform-tests/secure-contexts/support/https-subframe-dedicated.html
index 85005df2929b1..bcf27879e84f1 100644
--- a/tests/wpt/web-platform-tests/secure-contexts/support/https-subframe-dedicated.html
+++ b/tests/wpt/web-platform-tests/secure-contexts/support/https-subframe-dedicated.html
@@ -1,21 +1,33 @@
 <!DOCTYPE html>
 <script src="../server-locations.sub.js"></script>
 <script>
-  var w1 = new Worker(http_dir + "support/dedicated-worker-script.js");
-  w1.onmessage = function(e) {
-    parent.postMessage({ type: "http", error: false,
-                         isSecureContext: e.data }, "*");
-  };
-  w1.onerror = function(e) {
+  try {
+    var w1 = new Worker(http_dir + "support/dedicated-worker-script.js");
+    w1.onmessage = function(e) {
+      parent.postMessage({ type: "http", error: false,
+                           isSecureContext: e.data }, "*");
+    };
+    w1.onerror = function(e) {
+      parent.postMessage({ type: "http", error: true }, "*");
+    };
+  } catch (e) {
+    // Some browsers throw for cross-origin URLs. This violates the Worker spec,
+    // but isn't actually relevant to what we're testing here.
     parent.postMessage({ type: "http", error: true }, "*");
-  };
+  }
 
-  var w2 = new Worker(https_dir + "support/dedicated-worker-script.js");
-  w2.onmessage = function(e) {
-    parent.postMessage({ type: "https", error: false,
-                         isSecureContext: e.data }, "*");
-  };
-  w2.onerror = function(e) {
+  try {
+    var w2 = new Worker(https_dir + "support/dedicated-worker-script.js");
+    w2.onmessage = function(e) {
+      parent.postMessage({ type: "https", error: false,
+                           isSecureContext: e.data }, "*");
+    };
+    w2.onerror = function(e) {
+      parent.postMessage({ type: "https", error: true }, "*");
+    }
+  } catch (e) {
+    // Some browsers throw for cross-origin URLs. This violates the Worker spec,
+    // but isn't actually relevant to what we're testing here.
     parent.postMessage({ type: "https", error: true }, "*");
   }
 </script>
diff --git a/tests/wpt/web-platform-tests/secure-contexts/support/parent-dedicated-worker-script.js b/tests/wpt/web-platform-tests/secure-contexts/support/parent-dedicated-worker-script.js
index a8447552df07d..2b6743238446c 100644
--- a/tests/wpt/web-platform-tests/secure-contexts/support/parent-dedicated-worker-script.js
+++ b/tests/wpt/web-platform-tests/secure-contexts/support/parent-dedicated-worker-script.js
@@ -1,4 +1,9 @@
-var w = new Worker("dedicated-worker-script.js");
-w.onmessage = function (e) {
-  postMessage(e.data);
+// If nested workers aren't supported, punt:
+if (typeof Worker != "undefined") {
+  var w = new Worker("dedicated-worker-script.js");
+  w.onmessage = function (e) {
+    postMessage(e.data);
+  }
+} else {
+  postMessage("Nested workers not supported.");
 }
diff --git a/tests/wpt/web-platform-tests/secure-contexts/support/parent-shared-worker-script.js b/tests/wpt/web-platform-tests/secure-contexts/support/parent-shared-worker-script.js
index 7f999f9384724..083564a0541fb 100644
--- a/tests/wpt/web-platform-tests/secure-contexts/support/parent-shared-worker-script.js
+++ b/tests/wpt/web-platform-tests/secure-contexts/support/parent-shared-worker-script.js
@@ -1,8 +1,13 @@
 addEventListener("connect", function (e) {
   var port = e.ports[0];
   port.start();
-  var w = new Worker("dedicated-worker-script.js");
-  w.onmessage = function (e) {
-    port.postMessage(e.data);
+  // If nested workers aren't supported, punt:
+  if (typeof Worker != "undefined") {
+    var w = new Worker("dedicated-worker-script.js");
+    w.onmessage = function (e) {
+      port.postMessage(e.data);
+    }
+  } else {
+    port.postMessage("Nested workers not supported.");
   }
 });
diff --git a/tests/wpt/web-platform-tests/security/support/window-name-navigation.sub.html b/tests/wpt/web-platform-tests/security/support/window-name-navigation.sub.html
deleted file mode 100644
index 3200c35bed1be..0000000000000
--- a/tests/wpt/web-platform-tests/security/support/window-name-navigation.sub.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <script>
-        var url = new URL(window.location.href);
-        url.hostname = "{{GET[hostname]}}";
-        url.pathname = "/security/support/window-name-test.sub.html";
-        url.search = "shouldhavename={{GET[shouldhavename]}}&sendmessage={{GET[sendmessage]}}";
-        window.name = "test";
-        document.location = url.href;
-    </script>
-</html>
diff --git a/tests/wpt/web-platform-tests/security/support/window-name-test.sub.html b/tests/wpt/web-platform-tests/security/support/window-name-test.sub.html
deleted file mode 100644
index 65662031a044b..0000000000000
--- a/tests/wpt/web-platform-tests/security/support/window-name-test.sub.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<script src='/resources/testharness.js'></script>
-<script src='/resources/testharnessreport.js'></script>
-<script>
-  function process_test_result(passed, test_name) {
-    if ({{GET[sendmessage]}}) {
-      if (window.opener) {
-        window.opener.postMessage(passed, "*");
-      } else {
-        parent.postMessage(passed, "*");
-      }
-    } else {
-      test(function(t) {
-        assert_equals(passed, true);
-      }, test_name);
-    }
-  }
-
-  if ({{GET[shouldhavename]}}) {
-    process_test_result(window.name == "test", "Test that window name is present");
-  } else {
-    process_test_result(window.name == "", "Test that window name is not present");
-  }
-</script>
diff --git a/tests/wpt/web-platform-tests/security/window-name-after-cross-origin-aux-frame-navigation.sub.html b/tests/wpt/web-platform-tests/security/window-name-after-cross-origin-aux-frame-navigation.sub.html
deleted file mode 100644
index 6bc64c6373615..0000000000000
--- a/tests/wpt/web-platform-tests/security/window-name-after-cross-origin-aux-frame-navigation.sub.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <!-- window.name should equal "test" after a cross-origin auxiliary frame navigation. -->
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-</head>
-<body>
-    <script>
-        t = async_test("Test that the window name is correct");
-        window.addEventListener("message", t.step_func_done(function(e) {
-            assert_equals(e.data, true);
-        }));
-        window.open("support/window-name-navigation.sub.html?hostname={{domains[www1]}}&shouldhavename=true&sendmessage=true");
-    </script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/security/window-name-after-cross-origin-main-frame-navigation.sub.html b/tests/wpt/web-platform-tests/security/window-name-after-cross-origin-main-frame-navigation.sub.html
deleted file mode 100644
index 3f26c05fb6e58..0000000000000
--- a/tests/wpt/web-platform-tests/security/window-name-after-cross-origin-main-frame-navigation.sub.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <!-- window.name should equal "" after a cross-origin main frame navigation. -->
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-</head>
-<body>
-    <script>
-        document.location = "support/window-name-navigation.sub.html?hostname={{domains[www1]}}&shouldhavename=false&sendmessage=false";
-    </script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/security/window-name-after-cross-origin-sub-frame-navigation.sub.html b/tests/wpt/web-platform-tests/security/window-name-after-cross-origin-sub-frame-navigation.sub.html
deleted file mode 100644
index a309be6d80132..0000000000000
--- a/tests/wpt/web-platform-tests/security/window-name-after-cross-origin-sub-frame-navigation.sub.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <!-- window.name should equal "test" after a cross-origin sub frame navigation. -->
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-</head>
-<body>
-    <script>
-        t = async_test("Test that the window name is correct");
-        window.addEventListener("message", t.step_func_done(function(e) {
-            assert_equals(e.data, true);
-        }));
-    </script>
-    <iframe src="support/window-name-navigation.sub.html?hostname={{domains[www1]}}&shouldhavename=true&sendmessage=true";
-    </iframe>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/security/window-name-after-same-origin-aux-frame-navigation.sub.html b/tests/wpt/web-platform-tests/security/window-name-after-same-origin-aux-frame-navigation.sub.html
deleted file mode 100644
index 8e0a95d8c0862..0000000000000
--- a/tests/wpt/web-platform-tests/security/window-name-after-same-origin-aux-frame-navigation.sub.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <!-- window.name should equal "test" after a same-origin auxiliary frame navigation. -->
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-</head>
-<body>
-    <script>
-        t = async_test("Test that the window name is correct");
-        window.addEventListener("message", t.step_func_done(function(e) {
-            assert_equals(e.data, true);
-        }));
-        window.open("support/window-name-navigation.sub.html?hostname={{host}}&shouldhavename=true&sendmessage=true");
-    </script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/security/window-name-after-same-origin-main-frame-navigation.sub.html b/tests/wpt/web-platform-tests/security/window-name-after-same-origin-main-frame-navigation.sub.html
deleted file mode 100644
index 03365b9800822..0000000000000
--- a/tests/wpt/web-platform-tests/security/window-name-after-same-origin-main-frame-navigation.sub.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <!-- window.name should equal "test" after a same-origin main frame navigation. -->
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-</head>
-<body>
-    <script>
-        document.location = "support/window-name-navigation.sub.html?hostname={{host}}&shouldhavename=true&sendmessage=false";
-    </script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/security/window-name-after-same-origin-sub-frame-navigation.sub.html b/tests/wpt/web-platform-tests/security/window-name-after-same-origin-sub-frame-navigation.sub.html
deleted file mode 100644
index 48a6e247b05d2..0000000000000
--- a/tests/wpt/web-platform-tests/security/window-name-after-same-origin-sub-frame-navigation.sub.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <!-- window.name should equal "test" after a same-origin sub frame navigation. -->
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-</head>
-<body>
-    <script>
-        t = async_test("Test that the window name is correct");
-        window.addEventListener("message", t.step_func_done(function(e) {
-            assert_equals(e.data, true);
-        }));
-    </script>
-    <iframe src="support/window-name-navigation.sub.html?hostname={{host}}&shouldhavename=true&sendmessage=true";
-    </iframe>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.html
index 51446caebc62d..9998a712d37cf 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.html
@@ -428,5 +428,69 @@
       .catch(unreached_rejection(t));
   }, 'Service Worker responds to fetch event with the correct integrity_metadata');
 
+// Test that the service worker can read FetchEvent#body when it is a string.
+// It responds with request body it read.
+promise_test(t => {
+    // Set scope to "?ignore" so the service worker falls back to network
+    // for the main resource request, and add a suffix to avoid colliding
+    // with other tests.
+    const scope = 'resources/simple.html?ignore-for-request-body-string';
+    let frame;
+
+    return service_worker_unregister_and_register(t, worker, scope)
+      .then(reg => {
+          add_completion_callback(() => { reg.unregister(); });
+          return wait_for_state(t, reg.installing, 'activated');
+        })
+      .then(() => {
+          return with_iframe(scope); })
+      .then(f => {
+          frame = f;
+          return frame.contentWindow.fetch('simple.html?request-body', {
+              method: 'POST',
+              body: 'i am the request body'
+            });
+        })
+      .then(response => {
+          return response.text();
+        })
+      .then(response_text => {
+          frame.remove();
+          assert_equals(response_text, 'i am the request body');
+        });
+  }, 'FetchEvent#body is a string');
+
+// Test that the service worker can read FetchEvent#body when it is a blob.
+// It responds with request body it read.
+promise_test(t => {
+    // Set scope to "?ignore" so the service worker falls back to network
+    // for the main resource request, and add a suffix to avoid colliding
+    // with other tests.
+    const scope = 'resources/simple.html?ignore-for-request-body-blob';
+    let frame;
+
+    return service_worker_unregister_and_register(t, worker, scope)
+      .then(reg => {
+          add_completion_callback(() => { reg.unregister(); });
+          return wait_for_state(t, reg.installing, 'activated');
+        })
+      .then(() => {
+          return with_iframe(scope); })
+      .then(f => {
+          frame = f;
+          const blob = new Blob(['it\'s me the blob', ' ', 'and more blob!']);
+          return frame.contentWindow.fetch('simple.html?request-body', {
+              method: 'POST',
+              body: blob
+            });
+        })
+      .then(response => {
+          return response.text();
+        })
+      .then(response_text => {
+          frame.remove();
+          assert_equals(response_text, 'it\'s me the blob and more blob!');
+        });
+  }, 'FetchEvent#body is a blob');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/request-body-blob.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/request-body-blob.https.html
deleted file mode 100644
index 7ae2cb0bf9385..0000000000000
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/request-body-blob.https.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>request body blob</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helpers.sub.js"></script>
-<script>
-'use strict';
-var resolve_done;
-var done;
-var done_was_called = new Promise(resolve => done = resolve);
-
-// This test creates an controlled iframe that does a request with a request
-// body blob. The service worker confirms it can read the blob and responds
-// with 'Pass'.
-promise_test(t => {
-    var worker = 'resources/request-body-blob-worker.js';
-    var scope = 'resources/request-body-blob-iframe.html';
-    return service_worker_unregister_and_register(t, worker, scope)
-      .then(reg => {
-           add_completion_callback(() => reg.unregister());
-           return wait_for_state(t, reg.installing, 'activated');
-         })
-      .then(() => with_iframe(scope))
-      .then(frame => {
-          t.add_cleanup(() => frame.remove());
-        })
-      .then(() => done_was_called)
-      .then(result => assert_equals(result, 'Pass'));
-  }, 'Service worker can read the request body blob');
-</script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-test-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-test-worker.js
index 61ae85e98986c..0846da15adde6 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-test-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-test-worker.js
@@ -1,3 +1,8 @@
+function handleHeaders(event) {
+  const headers = Array.from(event.request.headers);
+  event.respondWith(new Response(JSON.stringify(headers)));
+}
+
 function handleString(event) {
   event.respondWith(new Response('Test string'));
 }
@@ -113,14 +118,17 @@ function handleIntegrity(event) {
   event.respondWith(new Response(event.request.integrity));
 }
 
-function handleHeaders(event) {
-  const headers = Array.from(event.request.headers);
-  event.respondWith(new Response(JSON.stringify(headers)));
+function handleRequestBody(event) {
+  event.respondWith(event.request.text()
+    .then(text => {
+        return new Response(text);
+      }));
 }
 
 self.addEventListener('fetch', function(event) {
     var url = event.request.url;
     var handlers = [
+      { pattern: '?headers', fn: handleHeaders },
       { pattern: '?string', fn: handleString },
       { pattern: '?blob', fn: handleBlob },
       { pattern: '?referrerFull', fn: handleReferrerFull },
@@ -137,7 +145,7 @@ self.addEventListener('fetch', function(event) {
       { pattern: '?cache', fn: handleCache },
       { pattern: '?eventsource', fn: handleEventSource },
       { pattern: '?integrity', fn: handleIntegrity },
-      { pattern: '?headers', fn: handleHeaders },
+      { pattern: '?request-body', fn: handleRequestBody },
     ];
 
     var handler = null;
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-body-blob-iframe.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-body-blob-iframe.html
deleted file mode 100644
index 4abf5812c9137..0000000000000
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-body-blob-iframe.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>request-body-blob-iframe</title>
-<body></body>
-<script>
-var blob = new Blob(['it\'s me the blob',
-                     'and more blob!']);
-fetch('simple.html?post-with-blob-body',
-      { method: 'POST', body: blob })
-  .then(resp => {
-      if (!resp.ok)
-        return Promise.reject('bad response: ' + resp.status);
-      return resp.text()
-    })
-  .then(text => parent.done(text))
-  .catch(error => {
-      var reason = error.message || error.name || error;
-      parent.done('error: ' + reason);
-    });
-</script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-body-blob-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-body-blob-worker.js
deleted file mode 100644
index 1eb9144e7deeb..0000000000000
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-body-blob-worker.js
+++ /dev/null
@@ -1,11 +0,0 @@
-self.addEventListener('fetch', event => {
-    if (event.request.url.indexOf('?post-with-blob-body') == -1)
-      return;
-    event.respondWith(event.request.text().then(body => {
-        if (body.indexOf('it\'s me the blob') == -1)
-          return new Response('fail');
-        if (body.indexOf('and more blob!') == -1)
-          return new Response('fail');
-        return new Response('Pass');
-      }));
-  });
diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-post-dispatch.html b/tests/wpt/web-platform-tests/shadow-dom/event-post-dispatch.html
index d8b07b5895bc4..239881c7e153b 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/event-post-dispatch.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/event-post-dispatch.html
@@ -206,7 +206,7 @@
 let n7 = createTestTree(test7);
 document.body.appendChild(n7.test7);
 test(() => {
-  let log = dispatchEventWithEventLog(n7, n7.target, new MouseEvent('my-event', {bubbles: true, compoesed: true, relatedTarget: n7.relatedTarget}));
+  let log = dispatchEventWithEventLog(n7, n7.target, new MouseEvent('my-event', {bubbles: true, composed: true, relatedTarget: n7.relatedTarget}));
   assert_equals(log.event.target, n7.host1);
   assert_equals(log.event.relatedTarget, n7.host2);
   assert_equals(log.event.eventPhase, 0);
@@ -215,7 +215,7 @@
 }, 'Event properties post dispatch with relatedTarget in the different shadow trees. (composed: true)');
 
 test(() => {
-  let log = dispatchEventWithEventLog(n7, n7.target, new MouseEvent('my-event', {bubbles: true, compoesed: false, relatedTarget: n7.relatedTarget}));
+  let log = dispatchEventWithEventLog(n7, n7.target, new MouseEvent('my-event', {bubbles: true, composed: false, relatedTarget: n7.relatedTarget}));
   assert_equals(log.event.target, null);
   assert_equals(log.event.relatedTarget, null);
   assert_equals(log.event.eventPhase, 0);
diff --git a/tests/wpt/web-platform-tests/speech-api/OWNERS b/tests/wpt/web-platform-tests/speech-api/OWNERS
index 4fe844cf4b173..9acecca9d1c14 100644
--- a/tests/wpt/web-platform-tests/speech-api/OWNERS
+++ b/tests/wpt/web-platform-tests/speech-api/OWNERS
@@ -1,3 +1,4 @@
 @andrenatal
 @fleizach
 @gshires
+@jdsmith3000
diff --git a/tests/wpt/web-platform-tests/tools/ci/before_install.sh b/tests/wpt/web-platform-tests/tools/ci/before_install.sh
index ff2609ead5ce4..bf7d48c0042ac 100755
--- a/tests/wpt/web-platform-tests/tools/ci/before_install.sh
+++ b/tests/wpt/web-platform-tests/tools/ci/before_install.sh
@@ -6,6 +6,8 @@ if [[ $(./wpt test-jobs --includes $JOB; echo $?) -eq 0 ]]; then
     git submodule update --init --recursive 1>&2
     export DISPLAY=:99.0
     sh -e /etc/init.d/xvfb start 1>&2
+    # For uploading the manifest
+    export WPT_MANIFEST_FILE=$HOME/meta/MANIFEST-$(git rev-parse HEAD).json
 else
     export RUN_JOB=0
 fi
diff --git a/tests/wpt/web-platform-tests/tools/ci/check_stability.py b/tests/wpt/web-platform-tests/tools/ci/check_stability.py
index cf3e10d6d0e23..169962a55e6f2 100644
--- a/tests/wpt/web-platform-tests/tools/ci/check_stability.py
+++ b/tests/wpt/web-platform-tests/tools/ci/check_stability.py
@@ -9,7 +9,8 @@
 
 import requests
 
-wpt_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
+here = os.path.dirname(__file__)
+wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
 sys.path.insert(0, wpt_root)
 
 from tools.wpt import testfiles
@@ -26,6 +27,8 @@
 
 def setup_logging():
     """Set up basic debug logger."""
+    global logger
+    logger = logging.getLogger(here)
     handler = logging.StreamHandler(sys.stdout)
     formatter = logging.Formatter(logging.BASIC_FORMAT, None)
     handler.setFormatter(formatter)
@@ -241,6 +244,25 @@ def post_results(results, pr_number, iterations, product, url, status):
     requests.post(url, json=payload)
 
 
+def get_changed_files(manifest_path, rev, ignore_changes, skip_tests):
+    if not rev:
+        branch_point = testfiles.branch_point()
+        revish = "%s..HEAD" % branch_point
+    else:
+        revish = rev
+
+    files_changed, files_ignored = testfiles.files_changed(revish, ignore_changes)
+
+    if files_ignored:
+        logger.info("Ignoring %s changed files:\n%s" %
+                    (len(files_ignored), "".join(" * %s\n" % item for item in files_ignored)))
+
+    tests_changed, files_affected = testfiles.affected_testfiles(files_changed, skip_tests,
+                                                                 manifest_path=manifest_path)
+
+    return tests_changed, files_affected
+
+
 def main():
     """Perform check_stability functionality and return exit code."""
 
@@ -280,8 +302,6 @@ def run(venv, wpt_args, **kwargs):
     except OSError:
         pass
 
-    logger = logging.getLogger(os.path.splitext(__file__)[0])
-
     setup_logging()
 
     browser_name = wpt_args.product.split(":")[0]
@@ -304,29 +324,25 @@ def run(venv, wpt_args, **kwargs):
         head_sha1 = get_sha1()
         logger.info("Testing web-platform-tests at revision %s" % head_sha1)
 
-        if not kwargs["rev"]:
-            branch_point = testfiles.branch_point()
-            revish = "%s..HEAD" % branch_point
-        else:
-            revish = kwargs["rev"]
+        wpt_kwargs = Kwargs(vars(wpt_args))
 
-        files_changed, files_ignored = testfiles.files_changed(revish, ignore_changes)
+        if not wpt_kwargs["test_list"]:
+            manifest_path = os.path.join(wpt_kwargs["metadata_root"], "MANIFEST.json")
+            tests_changed, files_affected = get_changed_files(manifest_path, kwargs["rev"],
+                                                              ignore_changes, skip_tests)
 
-        if files_ignored:
-            logger.info("Ignoring %s changed files:\n%s" % (len(files_ignored),
-                                                            "".join(" * %s\n" % item for item in files_ignored)))
+            if not (tests_changed or files_affected):
+                logger.info("No tests changed")
+                return 0
 
-        tests_changed, files_affected = testfiles.affected_testfiles(files_changed, skip_tests,
-                                                                     manifest_path=os.path.join(
-                                                                         wpt_args.metadata_root,
-                                                                         "MANIFEST.json"))
+            if tests_changed:
+                logger.debug("Tests changed:\n%s" % "".join(" * %s\n" % item for item in tests_changed))
 
-        if not (tests_changed or files_affected):
-            logger.info("No tests changed")
-            return 0
+            if files_affected:
+                logger.debug("Affected tests:\n%s" % "".join(" * %s\n" % item for item in files_affected))
+
+            wpt_kwargs["test_list"] = list(tests_changed | files_affected)
 
-        wpt_kwargs = Kwargs(vars(wpt_args))
-        wpt_kwargs["test_list"] = list(tests_changed | files_affected)
         set_default_args(wpt_kwargs)
 
         do_delayed_imports()
@@ -340,12 +356,6 @@ def run(venv, wpt_args, **kwargs):
 
         logger.info("Using binary %s" % wpt_kwargs["binary"])
 
-        if tests_changed:
-            logger.debug("Tests changed:\n%s" % "".join(" * %s\n" % item for item in tests_changed))
-
-        if files_affected:
-            logger.debug("Affected tests:\n%s" % "".join(" * %s\n" % item for item in files_affected))
-
 
     with TravisFold("running_tests"):
         logger.info("Starting tests")
@@ -377,7 +387,7 @@ def run(venv, wpt_args, **kwargs):
 if __name__ == "__main__":
     try:
         retcode = main()
-    except:
+    except Exception:
         import traceback
         traceback.print_exc()
         sys.exit(1)
diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_manifest.sh b/tests/wpt/web-platform-tests/tools/ci/ci_manifest.sh
new file mode 100644
index 0000000000000..90dea16651c91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/ci/ci_manifest.sh
@@ -0,0 +1,12 @@
+set -ex
+
+SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+WPT_ROOT=$(readlink -f $SCRIPT_DIR/../..)
+cd $WPT_ROOT
+
+mkdir -p ~/meta
+
+./wpt manifest -p ~/meta/MANIFEST.json
+cp ~/meta/MANIFEST.json $WPT_MANIFEST_FILE
+# Force overwrite of any existing file
+gzip -f $WPT_MANIFEST_FILE
diff --git a/tests/wpt/web-platform-tests/tools/ci/jobs.py b/tests/wpt/web-platform-tests/tools/ci/jobs.py
index 2d2ef2ae6cb7a..9ec29a897cc30 100644
--- a/tests/wpt/web-platform-tests/tools/ci/jobs.py
+++ b/tests/wpt/web-platform-tests/tools/ci/jobs.py
@@ -21,6 +21,7 @@
                   "!.*/README",
                   "!css/[^/]*$"],
     "lint": [".*"],
+    "manifest_upload": [".*"],
     "resources_unittest": ["resources/"],
     "tools_unittest": ["tools/"],
     "wptrunner_unittest": ["tools/wptrunner/*"],
@@ -99,6 +100,12 @@ def get_jobs(paths, **kwargs):
         if not rules:
             break
 
+    # Default jobs shuld run even if there were no changes
+    if not paths:
+        for job, path_re in iteritems(job_path_map):
+            if ".*" in path_re:
+                jobs.add(job)
+
     return jobs
 
 
@@ -116,4 +123,4 @@ def run(**kwargs):
         for item in sorted(jobs):
             print(item)
     else:
-        return 0 if set(kwargs["includes"]) == jobs else 1
+        return 0 if set(kwargs["includes"]).issubset(jobs) else 1
diff --git a/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py b/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py
index 3192a471b85ce..1b1ed36206492 100644
--- a/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py
+++ b/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py
@@ -1,12 +1,16 @@
 from tools.ci import jobs
 
+default_jobs = set(["lint", "manifest_upload"])
+
+
 def test_testharness():
-    assert jobs.get_jobs(["resources/testharness.js"]) == set(["lint", "resources_unittest"])
+    assert jobs.get_jobs(["resources/testharness.js"]) == default_jobs | set(["resources_unittest"])
     assert jobs.get_jobs(["resources/testharness.js"],
                          includes=["resources_unittest"]) == set(["resources_unittest"])
     assert jobs.get_jobs(["foo/resources/testharness.js"],
                          includes=["resources_unittest"]) == set()
 
+
 def test_stability():
     assert jobs.get_jobs(["dom/historical.html"],
                          includes=["stability"]) == set(["stability"])
@@ -32,8 +36,10 @@ def test_stability():
                           "css/CSS21/test-001.html"],
                          includes=["stability"]) == set(["stability"])
 
-def test_lint():
-    assert jobs.get_jobs(["README.md"]) == set(["lint"])
+
+def test_default():
+    assert jobs.get_jobs(["README.md"]) == default_jobs
+
 
 def test_tools_unittest():
     assert jobs.get_jobs(["tools/ci/test/test_jobs.py"],
@@ -43,12 +49,14 @@ def test_tools_unittest():
     assert jobs.get_jobs(["dom/historical.html"],
                          includes=["tools_unittest"]) == set()
 
+
 def test_wptrunner_unittest():
     assert jobs.get_jobs(["tools/wptrunner/wptrunner/wptrunner.py"],
                          includes=["wptrunner_unittest"]) == set(["wptrunner_unittest"])
     assert jobs.get_jobs(["tools/example.py"],
                          includes=["wptrunner_unittest"]) == set()
 
+
 def test_build_css():
     assert jobs.get_jobs(["css/css-build-testsuites.sh"],
                          includes=["build_css"]) == set(["build_css"])
diff --git a/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py b/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py
index 60fa330c25a2b..629ed6b412e4e 100644
--- a/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py
+++ b/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py
@@ -66,7 +66,7 @@ def fnmatch_translate(pat, path_name=False):
     parts.append("$")
     try:
         return re.compile("".join(parts))
-    except:
+    except Exception:
         raise
 
 
diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/web-platform-tests/tools/lint/lint.py
index e4ad323cc8d53..1a5ee1c1b173d 100644
--- a/tests/wpt/web-platform-tests/tools/lint/lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/lint.py
@@ -361,6 +361,13 @@ class LayoutTestsRegexp(Regexp):
     file_extensions = [".html", ".htm", ".js", ".xht", ".xhtml", ".svg"]
     description = "eventSender/testRunner/window.internals used; these are LayoutTests-specific APIs (WebKit/Blink)"
 
+class SpecialPowersRegexp(Regexp):
+    pattern = b"SpecialPowers"
+    error = "SPECIALPOWERS API"
+    file_extensions = [".html", ".htm", ".js", ".xht", ".xhtml", ".svg"]
+    description = "SpecialPowers used; this is gecko-specific and not supported in wpt"
+
+
 regexps = [item() for item in
            [TrailingWhitespaceRegexp,
             TabsRegexp,
@@ -371,7 +378,8 @@ class LayoutTestsRegexp(Regexp):
             ConsoleRegexp,
             GenerateTestsRegexp,
             PrintRegexp,
-            LayoutTestsRegexp]]
+            LayoutTestsRegexp,
+            SpecialPowersRegexp]]
 
 def check_regexp_line(repo_root, path, f, css_mode):
     errors = []
diff --git a/tests/wpt/web-platform-tests/tools/manifest/commands.json b/tests/wpt/web-platform-tests/tools/manifest/commands.json
index 322cc59811bad..d6ccd98809ef8 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/commands.json
+++ b/tests/wpt/web-platform-tests/tools/manifest/commands.json
@@ -1,3 +1,6 @@
 {"manifest":
  {"path": "update.py", "script": "run", "parser": "create_parser", "help": "Update the MANIFEST.json file",
+  "virtualenv": false},
+ "manifest-download":
+ {"path": "download.py", "script": "run", "parser": "create_parser", "help": "Download recent pregenerated MANIFEST.json file",
   "virtualenv": false}}
diff --git a/tests/wpt/web-platform-tests/tools/manifest/download.py b/tests/wpt/web-platform-tests/tools/manifest/download.py
new file mode 100644
index 0000000000000..42998a2a2dba7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/manifest/download.py
@@ -0,0 +1,130 @@
+import argparse
+import gzip
+import json
+import io
+import log
+import os
+from datetime import datetime, timedelta
+
+import urllib2
+
+from vcs import Git
+
+here = os.path.dirname(__file__)
+
+wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
+logger = log.get_logger()
+
+
+def abs_path(path):
+    return os.path.abspath(os.path.expanduser(path))
+
+
+def should_download(manifest_path, rebuild_time=timedelta(days=5)):
+    if not os.path.exists(manifest_path):
+        return True
+    mtime = datetime.fromtimestamp(os.path.getmtime(manifest_path))
+    if mtime < datetime.now() - rebuild_time:
+        return True
+    logger.info("Skipping manifest download because existing file is recent")
+    return False
+
+
+def git_commits(repo_root):
+    git = Git.get_func(repo_root)
+    return [item for item in git("log", "--format=%H", "-n50").split("\n") if item]
+
+
+def github_url(commits):
+    try:
+        resp = urllib2.urlopen("https://api.github.com/repos/w3c/web-platform-tests/releases")
+    except Exception:
+        return None
+
+    if resp.code != 200:
+        return None
+
+    try:
+        releases = json.load(resp.fp)
+    except ValueError:
+        logger.warning("Response was not valid JSON")
+        return None
+
+    fallback = None
+    for release in releases:
+        for commit in commits:
+            for item in release["assets"]:
+                if item["name"] == "MANIFEST-%s.json.gz" % commit:
+                    return item["browser_download_url"]
+                elif item["name"] == "MANIFEST.json.gz" and not fallback:
+                    fallback = item["browser_download_url"]
+    if fallback:
+        logger.info("Can't find a commit-specific manifest so just using the most recent one")
+        return fallback
+
+
+def download_manifest(manifest_path, commits_func, url_func, force=False):
+    if not force and not should_download(manifest_path):
+        return False
+
+    commits = commits_func()
+
+    url = url_func(commits)
+    if not url:
+        logger.warning("No generated manifest found")
+        return False
+
+    logger.info("Downloading manifest from %s" % url)
+    try:
+        resp = urllib2.urlopen(url)
+    except Exception:
+        logger.warning("Downloading pregenerated manifest failed")
+        return False
+
+    if resp.code != 200:
+        logger.warning("Downloading pregenerated manifest failed; got HTTP status %d" %
+                       resp.code)
+        return False
+
+    gzf = gzip.GzipFile(fileobj=io.BytesIO(resp.read()))
+
+    try:
+        decompressed = gzf.read()
+    except IOError:
+        logger.warning("Failed to decompress downloaded file")
+        return False
+
+    try:
+        with open(manifest_path, "w") as f:
+            f.write(decompressed)
+    except Exception:
+        logger.warning("Failed to write manifest")
+        return False
+    logger.info("Manifest downloaded")
+    return True
+
+
+def create_parser():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-p", "--path", type=abs_path, help="Path to manifest file.")
+    parser.add_argument(
+        "--tests-root", type=abs_path, default=wpt_root, help="Path to root of tests.")
+    parser.add_argument(
+        "--force", action="store_true",
+        help="Always download, even if the existing manifest is recent")
+    return parser
+
+
+def download_from_github(path, tests_root, force=False):
+    return download_manifest(path, lambda: git_commits(tests_root), github_url,
+                             force=force)
+
+
+def run(**kwargs):
+    if kwargs["path"] is None:
+        path = os.path.join(kwargs["tests_root"], "MANIFEST.json")
+    else:
+        path = kwargs["path"]
+    success = download_from_github(path, kwargs["tests_root"], kwargs["force"])
+    return 0 if success else 1
diff --git a/tests/wpt/web-platform-tests/tools/manifest/update.py b/tests/wpt/web-platform-tests/tools/manifest/update.py
index 0bbbefb9111c0..29c80105735d4 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/update.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/update.py
@@ -7,13 +7,16 @@
 import manifest
 from . import vcs
 from .log import get_logger
+from .download import download_from_github
 
 here = os.path.dirname(__file__)
 
 wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
 
+logger = get_logger()
 
 def update(tests_root, manifest, working_copy=False):
+    logger.info("Updating manifest")
     tree = None
     if not working_copy:
         tree = vcs.Git.for_path(tests_root, manifest.url_base)
@@ -29,7 +32,9 @@ def update_from_cli(**kwargs):
     assert tests_root is not None
 
     m = None
-    logger = get_logger()
+
+    if kwargs["download"]:
+        download_from_github(path, tests_root)
 
     if not kwargs.get("rebuild", False):
         try:
@@ -37,8 +42,6 @@ def update_from_cli(**kwargs):
         except manifest.ManifestVersionMismatch:
             logger.info("Manifest version changed, rebuilding")
             m = None
-        else:
-            logger.info("Updating manifest")
 
     if m is None:
         m = manifest.Manifest(kwargs["url_base"])
@@ -69,6 +72,9 @@ def create_parser():
     parser.add_argument(
         "--url-base", action="store", default="/",
         help="Base url to use as the mount point for tests in this manifest.")
+    parser.add_argument(
+        "--no-download", dest="download", action="store_false", default=True,
+        help="Never attempt to download the manifest.")
     return parser
 
 
diff --git a/tests/wpt/web-platform-tests/tools/runner/index.html b/tests/wpt/web-platform-tests/tools/runner/index.html
index c46c963c0e72b..5dfc1dcf36e64 100644
--- a/tests/wpt/web-platform-tests/tools/runner/index.html
+++ b/tests/wpt/web-platform-tests/tools/runner/index.html
@@ -4,8 +4,9 @@
 <title>Web tests</title>
 <link rel='stylesheet' href='css/bootstrap.min.css'>
 <link rel='stylesheet' href='css/bootstrap-theme.min.css'>
-<link rel=stylesheet href=runner.css>
-<script src=runner.js></script>
+<link rel='stylesheet' href='runner.css'>
+<script src='/common/get-host-info.sub.js'></script>
+<script src='runner.js'></script>
 
 
 <header class="navbar navbar-inverse navbar-fixed-top">
diff --git a/tests/wpt/web-platform-tests/tools/runner/runner.js b/tests/wpt/web-platform-tests/tools/runner/runner.js
index 8969105641c9a..c17c01f53dd43 100644
--- a/tests/wpt/web-platform-tests/tools/runner/runner.js
+++ b/tests/wpt/web-platform-tests/tools/runner/runner.js
@@ -654,7 +654,8 @@ Results.prototype = {
 };
 
 function Runner(manifest_path) {
-    this.server = location.protocol + "//" + location.host;
+    this.server = get_host_info().HTTP_ORIGIN;
+    this.https_server = get_host_info().HTTPS_ORIGIN;
     this.manifest = new Manifest(manifest_path);
     this.path = null;
     this.test_types = null;
@@ -832,7 +833,10 @@ Runner.prototype = {
 
     load: function(path) {
         this.ensure_test_window();
-        this.test_window.location.href = this.server + path;
+        if (path.match(".https."))
+          this.test_window.location.href = this.https_server + path;
+        else
+          this.test_window.location.href = this.server + path;
     },
 
     progress: function() {
@@ -844,8 +848,26 @@ Runner.prototype = {
             this.num_tests = this.manifest_iterator.count();
         }
         return this.num_tests;
-    }
+    },
+
+    on_complete: function(tests, status) {
+      var harness_status_map = {0:"OK", 1:"ERROR", 2:"TIMEOUT", 3:"NOTRUN"};
+      var subtest_status_map = {0:"PASS", 1:"FAIL", 2:"TIMEOUT", 3:"NOTRUN"};
 
+      // this ugly hack is because IE really insists on holding on to the objects it creates in
+      // other windows, and on losing track of them when the window gets closed
+      var subtest_results = JSON.parse(JSON.stringify(
+          tests.map(function (test) {
+              return {name: test.name,
+                      status: subtest_status_map[test.status],
+                      message: test.message};
+          })
+      ));
+
+      runner.on_result(harness_status_map[status.status],
+                       status.message,
+                       subtest_results);
+    }
 };
 
 
@@ -883,26 +905,12 @@ function setup() {
                      test_control.get_use_regex());
         return;
     }
-}
-
-window.completion_callback = function(tests, status) {
-    var harness_status_map = {0:"OK", 1:"ERROR", 2:"TIMEOUT", 3:"NOTRUN"};
-    var subtest_status_map = {0:"PASS", 1:"FAIL", 2:"TIMEOUT", 3:"NOTRUN"};
-
-    // this ugly hack is because IE really insists on holding on to the objects it creates in
-    // other windows, and on losing track of them when the window gets closed
-    var subtest_results = JSON.parse(JSON.stringify(
-        tests.map(function (test) {
-            return {name: test.name,
-                    status: subtest_status_map[test.status],
-                    message: test.message};
-        })
-    ));
 
-    runner.on_result(harness_status_map[status.status],
-                     status.message,
-                     subtest_results);
-};
+    window.addEventListener("message", function(e) {
+      if (e.data.type === "complete")
+        runner.on_complete(e.data.tests, e.data.status);
+    });
+}
 
 window.addEventListener("DOMContentLoaded", setup, false);
 })();
diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/web-platform-tests/tools/serve/serve.py
index 96417c326fa3a..f1cd008642d9e 100644
--- a/tests/wpt/web-platform-tests/tools/serve/serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/serve.py
@@ -279,7 +279,7 @@ def setup_logger(level):
     import logging
     global logger
     logger = logging.getLogger("web-platform-tests")
-    logging.basicConfig(level=getattr(logging, level.upper()))
+    logger.setLevel(getattr(logging, level.upper()))
     set_logger(logger)
 
 
@@ -397,7 +397,7 @@ def create_daemon(self, init_func, host, port, paths, routes, bind_hostname,
         except socket.error:
             print("Socket error on port %s" % port, file=sys.stderr)
             raise
-        except:
+        except Exception:
             print(traceback.format_exc(), file=sys.stderr)
             raise
 
@@ -408,7 +408,7 @@ def create_daemon(self, init_func, host, port, paths, routes, bind_hostname,
                     self.stop.wait()
                 except KeyboardInterrupt:
                     pass
-            except:
+            except Exception:
                 print(traceback.format_exc(), file=sys.stderr)
                 raise
 
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
index cc07b9191f1b5..8ee4c55c526bd 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
@@ -33,7 +33,7 @@ def from_http_response(cls, http_response):
         if body:
             try:
                 body = json.loads(body)
-            except:
+            except Exception:
                 raise error.UnknownErrorException("Failed to decode body as json:\n%s" % body)
 
         return cls(status, body)
diff --git a/tests/wpt/web-platform-tests/tools/wpt/commands.json b/tests/wpt/web-platform-tests/tools/wpt/commands.json
index 1ab767fea6a55..2e4b96fe7240c 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/commands.json
+++ b/tests/wpt/web-platform-tests/tools/wpt/commands.json
@@ -5,5 +5,6 @@
                       "help": "Get a list of files that have changed", "virtualenv": false},
     "tests-affected": {"path": "testfiles.py", "script": "run_tests_affected", "parser": "get_parser_affected",
                        "help": "Get a list of tests affected by changes", "virtualenv": false},
-    "install": {"path": "install.py", "script": "run", "parser": "get_parser", "help": "Install browser components"}
+    "install": {"path": "install.py", "script": "run", "parser": "get_parser", "help": "Install browser components"},
+    "branch-point": {"path": "testfiles.py", "script": "display_branch_point", "parser": null, "help": "Print branch point from master", "virtualenv": false}
 }
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index 1567a72721ba9..500402f596ac3 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -64,6 +64,7 @@ def args_general(kwargs):
     kwargs.set_if_none("tests_root", wpt_root)
     kwargs.set_if_none("metadata_root", wpt_root)
     kwargs.set_if_none("manifest_update", True)
+    kwargs.set_if_none("manifest_download", True)
 
     if kwargs["ssl_type"] in (None, "pregenerated"):
         cert_root = os.path.join(wpt_root, "tools", "certs")
@@ -109,8 +110,8 @@ def check_environ(product):
             for line in f:
                 line = line.split("#", 1)[0].strip()
                 parts = line.split()
-                if len(parts) == 2:
-                    host = parts[1]
+                hosts = parts[1:]
+                for host in hosts:
                     missing_hosts.discard(host)
             if missing_hosts:
                 raise WptrunError("""Missing hosts file configuration. Expected entries like:
@@ -415,5 +416,5 @@ def main():
     from tools import localpaths
     try:
         main()
-    except:
+    except Exception:
         pdb.post_mortem()
diff --git a/tests/wpt/web-platform-tests/tools/wpt/testfiles.py b/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
index 89e6e2764aeae..519a958d51109 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
@@ -27,9 +27,17 @@ def git(cmd, *args):
     return git
 
 
+def display_branch_point():
+    print(branch_point())
+
+
 def branch_point():
     git = get_git_cmd(wpt_root)
-    if os.environ.get("TRAVIS_PULL_REQUEST", "false") != "false":
+    if (os.environ.get("TRAVIS_PULL_REQUEST", "false") == "false" and
+        os.environ.get("TRAVIS_BRANCH") == "master"):
+        # For builds on the master branch just return the HEAD commit
+        return git("rev-parse", "HEAD")
+    elif os.environ.get("TRAVIS_PULL_REQUEST", "false") != "false":
         # This is a PR, so the base branch is in TRAVIS_BRANCH
         travis_branch = os.environ.get("TRAVIS_BRANCH")
         assert travis_branch, "TRAVIS_BRANCH environment variable is defined"
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
index e3b8d1f5fdb17..b2a0783a0972b 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
@@ -101,7 +101,6 @@ def test_tests_affected(capsys):
     assert excinfo.value.code == 0
     out, err = capsys.readouterr()
     assert "html/browsers/offline/appcache/workers/appcache-worker.html" in out
-    assert err == ""
 
 
 def test_serve():
diff --git a/tests/wpt/web-platform-tests/tools/wpt/utils.py b/tests/wpt/web-platform-tests/tools/wpt/utils.py
index 32e780f4e170e..e1f4cd4bb5c75 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/utils.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/utils.py
@@ -10,11 +10,17 @@
 
 
 class Kwargs(dict):
-    def set_if_none(self, name, value, err_fn=None, desc=None, extra_cond=None):
+    def set_if_none(self,
+                    name,            # type: str
+                    value,           # type: Any
+                    err_fn=None,     # type: (Kwargs, str) -> Any
+                    desc=None,       # type: str
+                    extra_cond=None  # type: (Kwargs) -> bool
+                    ):
         if desc is None:
             desc = name
 
-        if self[name] is None:
+        if name not in self or self[name] is None:
             if extra_cond is not None and not extra_cond(self):
                 return
             if callable(value):
diff --git a/tests/wpt/web-platform-tests/tools/wpt/wpt.py b/tests/wpt/web-platform-tests/tools/wpt/wpt.py
index cf94ce038d625..49f463d2a9ed1 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/wpt.py
@@ -1,6 +1,7 @@
 import argparse
-import os
 import json
+import logging
+import os
 import sys
 
 from tools import localpaths
@@ -89,6 +90,8 @@ def setup_virtualenv(path, props):
 
 
 def main(prog=None, argv=None):
+    logging.basicConfig(level=logging.INFO)
+
     if prog is None:
         prog = sys.argv[0]
     if argv is None:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
index 10f3586f14336..71c552325803a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
@@ -14,12 +14,17 @@
 
 manifest = None
 manifest_update = None
+download_from_github = None
+manifest_log = None
 
 def do_delayed_imports():
     # This relies on an already loaded module having set the sys.path correctly :(
-    global manifest, manifest_update
+    global manifest, manifest_update, download_from_github, manifest_log
     from manifest import manifest
     from manifest import update as manifest_update
+    from manifest.download import download_from_github
+    from manifest import log as manifest_log
+
 
 class TestChunker(object):
     def __init__(self, total_chunks, chunk_number):
@@ -372,10 +377,11 @@ def __call__(self, test_iter):
                 yield test
 
 class ManifestLoader(object):
-    def __init__(self, test_paths, force_manifest_update=False):
+    def __init__(self, test_paths, force_manifest_update=False, manifest_download=False):
         do_delayed_imports()
         self.test_paths = test_paths
         self.force_manifest_update = force_manifest_update
+        self.manifest_download = manifest_download
         self.logger = structured.get_default_logger()
         if self.logger is None:
             self.logger = structured.structuredlog.StructuredLogger("ManifestLoader")
@@ -391,13 +397,19 @@ def load(self):
         return rv
 
     def create_manifest(self, manifest_path, tests_path, url_base="/"):
-        self.update_manifest(manifest_path, tests_path, url_base, recreate=True)
+        self.update_manifest(manifest_path, tests_path, url_base, recreate=True,
+                             download=self.manifest_download)
 
     def update_manifest(self, manifest_path, tests_path, url_base="/",
-                        recreate=False):
+                        recreate=False, download=False):
         self.logger.info("Updating test manifest %s" % manifest_path)
+        manifest_log.setup()
 
         json_data = None
+        if download:
+            # TODO: make this not github-specific
+            download_from_github(manifest_path, tests_path)
+
         if not recreate:
             try:
                 with open(manifest_path) as f:
@@ -422,7 +434,7 @@ def load_manifest(self, tests_path, metadata_path, url_base="/"):
         manifest_path = os.path.join(metadata_path, "MANIFEST.json")
         if (not os.path.exists(manifest_path) or
             self.force_manifest_update):
-            self.update_manifest(manifest_path, tests_path, url_base)
+            self.update_manifest(manifest_path, tests_path, url_base, download=self.manifest_download)
         manifest_file = manifest.load(tests_path, manifest_path)
         if manifest_file.url_base != url_base:
             self.logger.info("Updating url_base in manifest from %s to %s" % (manifest_file.url_base,
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
index c4655b7fae3f5..882ac201c4a9e 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
@@ -157,6 +157,7 @@ def __init__(self, logger, browser, command_queue, no_timeout=False):
         self.started = False
 
         self.init_timer = None
+        self.command_queue = command_queue
 
     def update_settings(self, test):
         browser_settings = self.browser.settings(test)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/state.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/state.py
index 9454414e640be..dc459da7e2e5a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/state.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/state.py
@@ -44,6 +44,8 @@ def __getstate__(self):
     def load(cls, logger):
         """Load saved state from a file"""
         try:
+            if not os.path.isfile(cls.filename):
+                return None
             with open(cls.filename) as f:
                 try:
                     rv = pickle.load(f)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index a9a626429b162..b7d72c091a557 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -51,6 +51,8 @@ def create_parser(product_choices=None):
                         help="Regenerate the test manifest.")
     parser.add_argument("--no-manifest-update", action="store_false", dest="manifest_update",
                         help="Prevent regeneration of the test manifest.")
+    parser.add_argument("--manifest-download", action="store_true", default=None,
+                        help="Attempt to download a preexisting manifest when updating.")
 
     parser.add_argument("--timeout-multiplier", action="store", type=float, default=None,
                         help="Multiplier relative to standard test timeout to use")
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index 9855ecc672c9c..0c0042fffe3ce 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -45,7 +45,8 @@ def get_loader(test_paths, product, ssl_env, debug=None, run_info_extras=None, *
     run_info = wpttest.get_run_info(kwargs["run_info"], product, debug=debug,
                                     extras=run_info_extras)
 
-    test_manifests = testloader.ManifestLoader(test_paths, force_manifest_update=kwargs["manifest_update"]).load()
+    test_manifests = testloader.ManifestLoader(test_paths, force_manifest_update=kwargs["manifest_update"],
+                                               manifest_download=kwargs["manifest_download"]).load()
 
     manifest_filters = []
     meta_filters = []
diff --git a/tests/wpt/web-platform-tests/visual-viewport/OWNERS b/tests/wpt/web-platform-tests/visual-viewport/OWNERS
new file mode 100644
index 0000000000000..d1e9918656623
--- /dev/null
+++ b/tests/wpt/web-platform-tests/visual-viewport/OWNERS
@@ -0,0 +1 @@
+@bokand
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-attribute-event-handlers-manual.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-attribute-event-handlers-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-attribute-event-handlers-manual.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-attribute-event-handlers-manual.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-dimensions-custom-scrollbars-manual.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-dimensions-custom-scrollbars-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-dimensions-custom-scrollbars-manual.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-dimensions-custom-scrollbars-manual.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-dimensions-scrollbars-manual.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-dimensions-scrollbars-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-dimensions-scrollbars-manual.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-dimensions-scrollbars-manual.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-no-resize-event-on-overflow-recalc.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-no-resize-event-on-overflow-recalc.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-offset-manual.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-offset-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-offset-manual.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-offset-manual.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-page-manual.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-page-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-page-manual.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-page-manual.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-read-size-causes-layout.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-read-size-causes-layout.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-read-size-causes-layout.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-read-size-causes-layout.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-read-size-in-iframe-causes-layout.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-read-size-in-iframe-causes-layout.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-read-size-in-iframe-causes-layout.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-read-size-in-iframe-causes-layout.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-resize-event-manual.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-resize-event-manual.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-manual.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-resize-event-on-load-overflowing-page.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-load-overflowing-page.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-resize-event-on-load-overflowing-page.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-load-overflowing-page.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-scale-iframe-manual.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-scale-iframe-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-scale-iframe-manual.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-scale-iframe-manual.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-scale-manual.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-scale-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-scale-manual.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-scale-manual.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-scroll-event-manual.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-scroll-event-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-scroll-event-manual.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-scroll-event-manual.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-scrollbars-cause-resize.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-scrollbars-cause-resize.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-scrollbars-cause-resize.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-scrollbars-cause-resize.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-type.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-type.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-type.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-type.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-unscaled-scale-iframe.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scale-iframe.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-unscaled-scale-iframe.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scale-iframe.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-unscaled-scale.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scale.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-unscaled-scale.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scale.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-unscaled-scroll-iframe.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scroll-iframe.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-unscaled-scroll-iframe.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scroll-iframe.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-unscaled-scroll.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scroll.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-unscaled-scroll.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scroll.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-unscaled-size-iframe.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-size-iframe.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-unscaled-size-iframe.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-size-iframe.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-unscaled-size.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-size.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-unscaled-size.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-size.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport-url-bar-changes-height-manual.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-url-bar-changes-height-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport-url-bar-changes-height-manual.html
rename to tests/wpt/web-platform-tests/visual-viewport/viewport-url-bar-changes-height-manual.html
diff --git a/tests/wpt/web-platform-tests/viewport/viewport_support.js b/tests/wpt/web-platform-tests/visual-viewport/viewport_support.js
similarity index 100%
rename from tests/wpt/web-platform-tests/viewport/viewport_support.js
rename to tests/wpt/web-platform-tests/visual-viewport/viewport_support.js
diff --git a/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_true-manual.html
index 3eba98b4ee34a..5ff5660f0517b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_true-manual.html
@@ -31,26 +31,6 @@
                   "STATE_MODAL"
                ]
             ],
-            "AXAPI" : [
-               [
-                  "property",
-                  "AXRole",
-                  "is",
-                  "AXGroup"
-               ],
-               [
-                  "property",
-                  "AXSubrole",
-                  "is",
-                  "AXApplicationAlertDialog"
-               ],
-               [
-                  "property",
-                  "AXRoleDescription",
-                  "is",
-                  "web alert dialog"
-               ]
-            ],
             "IAccessible2" : [
                [
                   "property",
diff --git a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/dialog_modal_true-manual.html
index 4b5dfd689dc4f..2ce3fe6cd14a9 100644
--- a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/dialog_modal_true-manual.html
@@ -31,26 +31,6 @@
                   "STATE_MODAL"
                ]
             ],
-            "AXAPI" : [
-               [
-                  "property",
-                  "AXRole",
-                  "is",
-                  "AXGroup"
-               ],
-               [
-                  "property",
-                  "AXSubrole",
-                  "is",
-                  "AXApplicationDialog"
-               ],
-               [
-                  "property",
-                  "AXRoleDescription",
-                  "is",
-                  "web dialog"
-               ]
-            ],
             "IAccessible2" : [
                [
                   "property",
diff --git a/tests/wpt/web-platform-tests/wake-lock/OWNERS b/tests/wpt/web-platform-tests/wake-lock/OWNERS
new file mode 100644
index 0000000000000..fc40cda0c694b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wake-lock/OWNERS
@@ -0,0 +1,3 @@
+@andrey-logvinov
+@marcoscaceres
+@Honry
diff --git a/tests/wpt/web-platform-tests/wake-lock/interfaces.https.html b/tests/wpt/web-platform-tests/wake-lock/interfaces.https.html
new file mode 100644
index 0000000000000..12eb543f82e92
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wake-lock/interfaces.https.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Wake Lock API IDL tests</title>
+<link rel="author" title="Intel" href="http://www.intel.com">
+<link rel="help" href="https://w3c.github.io/wake-lock/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/WebIDLParser.js"></script>
+<script src="/resources/idlharness.js"></script>
+<script>
+"use strict";
+
+promise_test(async () => {
+  const idl_array = new IdlArray();
+  const dom_idl = await fetch("/interfaces/dom.idl").then(r => r.text());
+  const wakelock_idl = await fetch("/interfaces/wake-lock.idl").then(r => r.text());
+  const wakelock = await navigator.getWakeLock("screen");
+
+  idl_array.add_untested_idls(dom_idl);
+  idl_array.add_untested_idls('interface EventHandler {};');
+  idl_array.add_untested_idls('interface Navigator {};');
+  idl_array.add_idls(wakelock_idl);
+
+  window.wakelock = wakelock;
+  window.request = wakelock.createRequest();
+
+  idl_array.add_objects({
+    Navigator: ['navigator'],
+    WakeLock: ['wakelock'],
+    WakeLockRequest: ['request']
+  });
+  idl_array.test();
+}, "Test IDL implementation of WakeLock API");
+</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterationStart.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterationStart.html
index df3f992d4c2cd..ed2d0e097ac64 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterationStart.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffectTiming/iterationStart.html
@@ -25,7 +25,7 @@
                            duration: 100,
                            delay: 1 });
   anim.effect.timing.iterationStart = 2.5;
-  assert_equals(anim.effect.getComputedTiming().progress, 0.5);
+  assert_times_equal(anim.effect.getComputedTiming().progress, 0.5);
   assert_equals(anim.effect.getComputedTiming().currentIteration, 2);
 }, 'Test that changing the iterationStart affects computed timing ' +
    'when backwards-filling');
@@ -39,7 +39,7 @@
                            duration: 100,
                            delay: 0 });
   anim.effect.timing.iterationStart = 2.5;
-  assert_equals(anim.effect.getComputedTiming().progress, 0.5);
+  assert_times_equal(anim.effect.getComputedTiming().progress, 0.5);
   assert_equals(anim.effect.getComputedTiming().currentIteration, 2);
 }, 'Test that changing the iterationStart affects computed timing ' +
    'during the active phase');
@@ -54,7 +54,7 @@
                            delay: 0 });
   anim.finish();
   anim.effect.timing.iterationStart = 2.5;
-  assert_equals(anim.effect.getComputedTiming().progress, 0.5);
+  assert_times_equal(anim.effect.getComputedTiming().progress, 0.5);
   assert_equals(anim.effect.getComputedTiming().currentIteration, 3);
 }, 'Test that changing the iterationStart affects computed timing ' +
    'when forwards-filling');
diff --git a/tests/wpt/web-platform-tests/web-animations/resources/effect-tests.js b/tests/wpt/web-platform-tests/web-animations/resources/effect-tests.js
index 5d0f61838b168..4a0c66e1f28c6 100644
--- a/tests/wpt/web-platform-tests/web-animations/resources/effect-tests.js
+++ b/tests/wpt/web-platform-tests/web-animations/resources/effect-tests.js
@@ -17,6 +17,11 @@
 //   }
 //
 function assert_computed_timing_for_each_phase(animation, property, values) {
+  // Some computed timing properties (e.g. 'progress') require floating-point
+  // comparison, whilst exact equality suffices for others.
+  const assert_property_equals =
+      (property === 'progress') ? assert_times_equal : assert_equals;
+
   const effect = animation.effect;
   const timing = effect.getComputedTiming();
 
@@ -33,8 +38,8 @@ function assert_computed_timing_for_each_phase(animation, property, values) {
   } else {
     animation.currentTime = beforeActive;
   }
-  assert_equals(effect.getComputedTiming()[property], values.before,
-                `Value of ${property} in the before phase`);
+  assert_property_equals(effect.getComputedTiming()[property], values.before,
+                         `Value of ${property} in the before phase`);
 
   // Active phase
   if (effect.getComputedTiming().activeDuration > 0) {
@@ -43,8 +48,8 @@ function assert_computed_timing_for_each_phase(animation, property, values) {
     } else {
       animation.currentTime = activeAfter;
     }
-    assert_equals(effect.getComputedTiming()[property], values.activeBoundary,
-                  `Value of ${property} at the boundary of the active phase`);
+    assert_property_equals(effect.getComputedTiming()[property], values.activeBoundary,
+                           `Value of ${property} at the boundary of the active phase`);
   } else {
     assert_equals(values.activeBoundary, undefined,
                   'Test specifies a value to check during the active phase but'
@@ -58,8 +63,8 @@ function assert_computed_timing_for_each_phase(animation, property, values) {
     } else {
       animation.currentTime = activeAfter + 1;
     }
-    assert_equals(effect.getComputedTiming()[property], values.after,
-                  `Value of ${property} in the after phase`);
+    assert_property_equals(effect.getComputedTiming()[property], values.after,
+                           `Value of ${property} in the after phase`);
   } else {
     assert_equals(values.after, undefined,
                   'Test specifies a value to check during the after phase but'
diff --git a/tests/wpt/web-platform-tests/webaudio/chrome/resources/audioparam-testing.js b/tests/wpt/web-platform-tests/webaudio/chrome/resources/audioparam-testing.js
new file mode 100644
index 0000000000000..bc90ddbef8285
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/chrome/resources/audioparam-testing.js
@@ -0,0 +1,554 @@
+(function(global) {
+
+  // Information about the starting/ending times and starting/ending values for
+  // each time interval.
+  let timeValueInfo;
+
+  // The difference between starting values between each time interval.
+  let startingValueDelta;
+
+  // For any automation function that has an end or target value, the end value
+  // is based the starting value of the time interval.  The starting value will
+  // be increased or decreased by |startEndValueChange|. We choose half of
+  // |startingValueDelta| so that the ending value will be distinct from the
+  // starting value for next time interval.  This allows us to detect where the
+  // ramp begins and ends.
+  let startEndValueChange;
+
+  // Default threshold to use for detecting discontinuities that should appear
+  // at each time interval.
+  let discontinuityThreshold;
+
+  // Time interval between value changes.  It is best if 1 / numberOfTests is
+  // not close to timeInterval.
+  let timeIntervalInternal = .03;
+
+  let context;
+
+  // Make sure we render long enough to capture all of our test data.
+  function renderLength(numberOfTests) {
+    return timeToSampleFrame((numberOfTests + 1) * timeInterval, sampleRate);
+  }
+
+  // Create a constant reference signal with the given |value|.  Basically the
+  // same as |createConstantBuffer|, but with the parameters to match the other
+  // create functions.  The |endValue| is ignored.
+  function createConstantArray(
+      startTime, endTime, value, endValue, sampleRate) {
+    let startFrame = timeToSampleFrame(startTime, sampleRate);
+    let endFrame = timeToSampleFrame(endTime, sampleRate);
+    let length = endFrame - startFrame;
+
+    let buffer = createConstantBuffer(context, length, value);
+
+    return buffer.getChannelData(0);
+  }
+
+  function getStartEndFrames(startTime, endTime, sampleRate) {
+    // Start frame is the ceiling of the start time because the ramp starts at
+    // or after the sample frame.  End frame is the ceiling because it's the
+    // exclusive ending frame of the automation.
+    let startFrame = Math.ceil(startTime * sampleRate);
+    let endFrame = Math.ceil(endTime * sampleRate);
+
+    return {startFrame: startFrame, endFrame: endFrame};
+  }
+
+  // Create a linear ramp starting at |startValue| and ending at |endValue|. The
+  // ramp starts at time |startTime| and ends at |endTime|.  (The start and end
+  // times are only used to compute how many samples to return.)
+  function createLinearRampArray(
+      startTime, endTime, startValue, endValue, sampleRate) {
+    let frameInfo = getStartEndFrames(startTime, endTime, sampleRate);
+    let startFrame = frameInfo.startFrame;
+    let endFrame = frameInfo.endFrame;
+    let length = endFrame - startFrame;
+    let array = new Array(length);
+
+    let step = Math.fround(
+        (endValue - startValue) / (endTime - startTime) / sampleRate);
+    let start = Math.fround(
+        startValue +
+        (endValue - startValue) * (startFrame / sampleRate - startTime) /
+            (endTime - startTime));
+
+    let slope = (endValue - startValue) / (endTime - startTime);
+
+    // v(t) = v0 + (v1 - v0)*(t-t0)/(t1-t0)
+    for (k = 0; k < length; ++k) {
+      // array[k] = Math.fround(start + k * step);
+      let t = (startFrame + k) / sampleRate;
+      array[k] = startValue + slope * (t - startTime);
+    }
+
+    return array;
+  }
+
+  // Create an exponential ramp starting at |startValue| and ending at
+  // |endValue|. The ramp starts at time |startTime| and ends at |endTime|.
+  // (The start and end times are only used to compute how many samples to
+  // return.)
+  function createExponentialRampArray(
+      startTime, endTime, startValue, endValue, sampleRate) {
+    let deltaTime = endTime - startTime;
+
+    let frameInfo = getStartEndFrames(startTime, endTime, sampleRate);
+    let startFrame = frameInfo.startFrame;
+    let endFrame = frameInfo.endFrame;
+    let length = endFrame - startFrame;
+    let array = new Array(length);
+
+    let ratio = endValue / startValue;
+
+    // v(t) = v0*(v1/v0)^((t-t0)/(t1-t0))
+    for (let k = 0; k < length; ++k) {
+      let t = Math.fround((startFrame + k) / sampleRate);
+      array[k] = Math.fround(
+          startValue * Math.pow(ratio, (t - startTime) / deltaTime));
+    }
+
+    return array;
+  }
+
+  function discreteTimeConstantForSampleRate(timeConstant, sampleRate) {
+    return 1 - Math.exp(-1 / (sampleRate * timeConstant));
+  }
+
+  // Create a signal that starts at |startValue| and exponentially approaches
+  // the target value of |targetValue|, using a time constant of |timeConstant|.
+  // The ramp starts at time |startTime| and ends at |endTime|.  (The start and
+  // end times are only used to compute how many samples to return.)
+  function createExponentialApproachArray(
+      startTime, endTime, startValue, targetValue, sampleRate, timeConstant) {
+    let startFrameFloat = startTime * sampleRate;
+    let frameInfo = getStartEndFrames(startTime, endTime, sampleRate);
+    let startFrame = frameInfo.startFrame;
+    let endFrame = frameInfo.endFrame;
+    let length = Math.floor(endFrame - startFrame);
+    let array = new Array(length);
+    let c = discreteTimeConstantForSampleRate(timeConstant, sampleRate);
+
+    let delta = startValue - targetValue;
+
+    // v(t) = v1 + (v0 - v1) * exp(-(t-t0)/tau)
+    for (let k = 0; k < length; ++k) {
+      let t = (startFrame + k) / sampleRate;
+      let value =
+          targetValue + delta * Math.exp(-(t - startTime) / timeConstant);
+      array[k] = value;
+    }
+
+    return array;
+  }
+
+  // Create a sine wave of the specified duration.
+  function createReferenceSineArray(
+      startTime, endTime, startValue, endValue, sampleRate) {
+    // Ignore |startValue| and |endValue| for the sine wave.
+    let curve = createSineWaveArray(
+        endTime - startTime, freqHz, sineAmplitude, sampleRate);
+    // Sample the curve appropriately.
+    let frameInfo = getStartEndFrames(startTime, endTime, sampleRate);
+    let startFrame = frameInfo.startFrame;
+    let endFrame = frameInfo.endFrame;
+    let length = Math.floor(endFrame - startFrame);
+    let array = new Array(length);
+
+    // v(t) = linearly interpolate between V[k] and V[k + 1] where k =
+    // floor((N-1)/duration*(t - t0))
+    let f = (length - 1) / (endTime - startTime);
+
+    for (let k = 0; k < length; ++k) {
+      let t = (startFrame + k) / sampleRate;
+      let indexFloat = f * (t - startTime);
+      let index = Math.floor(indexFloat);
+      if (index + 1 < length) {
+        let v0 = curve[index];
+        let v1 = curve[index + 1];
+        array[k] = v0 + (v1 - v0) * (indexFloat - index);
+      } else {
+        array[k] = curve[length - 1];
+      }
+    }
+
+    return array;
+  }
+
+  // Create a sine wave of the given frequency and amplitude.  The sine wave is
+  // offset by half the amplitude so that result is always positive.
+  function createSineWaveArray(durationSeconds, freqHz, amplitude, sampleRate) {
+    let length = timeToSampleFrame(durationSeconds, sampleRate);
+    let signal = new Float32Array(length);
+    let omega = 2 * Math.PI * freqHz / sampleRate;
+    let halfAmplitude = amplitude / 2;
+
+    for (let k = 0; k < length; ++k) {
+      signal[k] = halfAmplitude + halfAmplitude * Math.sin(omega * k);
+    }
+
+    return signal;
+  }
+
+  // Return the difference between the starting value and the ending value for
+  // time interval |timeIntervalIndex|.  We alternate between an end value that
+  // is above or below the starting value.
+  function endValueDelta(timeIntervalIndex) {
+    if (timeIntervalIndex & 1) {
+      return -startEndValueChange;
+    } else {
+      return startEndValueChange;
+    }
+  }
+
+  // Relative error metric
+  function relativeErrorMetric(actual, expected) {
+    return (actual - expected) / Math.abs(expected);
+  }
+
+  // Difference metric
+  function differenceErrorMetric(actual, expected) {
+    return actual - expected;
+  }
+
+  // Return the difference between the starting value at |timeIntervalIndex| and
+  // the starting value at the next time interval.  Since we started at a large
+  // initial value, we decrease the value at each time interval.
+  function valueUpdate(timeIntervalIndex) {
+    return -startingValueDelta;
+  }
+
+  // Compare a section of the rendered data against our expected signal.
+  function comparePartialSignals(
+      should, rendered, expectedFunction, startTime, endTime, valueInfo,
+      sampleRate, errorMetric) {
+    let startSample = timeToSampleFrame(startTime, sampleRate);
+    let expected = expectedFunction(
+        startTime, endTime, valueInfo.startValue, valueInfo.endValue,
+        sampleRate, timeConstant);
+
+    let n = expected.length;
+    let maxError = -1;
+    let maxErrorIndex = -1;
+
+    for (let k = 0; k < n; ++k) {
+      // Make sure we don't pass these tests because a NaN has been generated in
+      // either the
+      // rendered data or the reference data.
+      if (!isValidNumber(rendered[startSample + k])) {
+        maxError = Infinity;
+        maxErrorIndex = startSample + k;
+        should(
+            isValidNumber(rendered[startSample + k]),
+            'NaN or infinity for rendered data at ' + maxErrorIndex)
+            .beTrue();
+        break;
+      }
+      if (!isValidNumber(expected[k])) {
+        maxError = Infinity;
+        maxErrorIndex = startSample + k;
+        should(
+            isValidNumber(expected[k]),
+            'NaN or infinity for rendered data at ' + maxErrorIndex)
+            .beTrue();
+        break;
+      }
+      let error = Math.abs(errorMetric(rendered[startSample + k], expected[k]));
+      if (error > maxError) {
+        maxError = error;
+        maxErrorIndex = k;
+      }
+    }
+
+    return {maxError: maxError, index: maxErrorIndex, expected: expected};
+  }
+
+  // Find the discontinuities in the data and compare the locations of the
+  // discontinuities with the times that define the time intervals. There is a
+  // discontinuity if the difference between successive samples exceeds the
+  // threshold.
+  function verifyDiscontinuities(should, values, times, threshold) {
+    let n = values.length;
+    let success = true;
+    let badLocations = 0;
+    let breaks = [];
+
+    // Find discontinuities.
+    for (let k = 1; k < n; ++k) {
+      if (Math.abs(values[k] - values[k - 1]) > threshold) {
+        breaks.push(k);
+      }
+    }
+
+    let testCount;
+
+    // If there are numberOfTests intervals, there are only numberOfTests - 1
+    // internal interval boundaries. Hence the maximum number of discontinuties
+    // we expect to find is numberOfTests - 1. If we find more than that, we
+    // have no reference to compare against. We also assume that the actual
+    // discontinuities are close to the expected ones.
+    //
+    // This is just a sanity check when something goes really wrong.  For
+    // example, if the threshold is too low, every sample frame looks like a
+    // discontinuity.
+    if (breaks.length >= numberOfTests) {
+      testCount = numberOfTests - 1;
+      should(breaks.length, 'Number of discontinuities')
+          .beLessThan(numberOfTests);
+      success = false;
+    } else {
+      testCount = breaks.length;
+    }
+
+    // Compare the location of each discontinuity with the end time of each
+    // interval. (There is no discontinuity at the start of the signal.)
+    for (let k = 0; k < testCount; ++k) {
+      let expectedSampleFrame = timeToSampleFrame(times[k + 1], sampleRate);
+      if (breaks[k] != expectedSampleFrame) {
+        success = false;
+        ++badLocations;
+        should(breaks[k], 'Discontinuity at index')
+            .beEqualTo(expectedSampleFrame);
+      }
+    }
+
+    if (badLocations) {
+      should(badLocations, 'Number of discontinuites at incorrect locations')
+          .beEqualTo(0);
+      success = false;
+    } else {
+      should(
+          breaks.length + 1,
+          'Number of tests started and ended at the correct time')
+          .beEqualTo(numberOfTests);
+    }
+
+    return success;
+  }
+
+  // Compare the rendered data with the expected data.
+  //
+  // testName - string describing the test
+  //
+  // maxError - maximum allowed difference between the rendered data and the
+  // expected data
+  //
+  // rendererdData - array containing the rendered (actual) data
+  //
+  // expectedFunction - function to compute the expected data
+  //
+  // timeValueInfo - array containing information about the start and end times
+  // and the start and end values of each interval.
+  //
+  // breakThreshold - threshold to use for determining discontinuities.
+  function compareSignals(
+      should, testName, maxError, renderedData, expectedFunction, timeValueInfo,
+      breakThreshold, errorMetric) {
+    let success = true;
+    let failedTestCount = 0;
+    let times = timeValueInfo.times;
+    let values = timeValueInfo.values;
+    let n = values.length;
+    let expectedSignal = [];
+
+    success =
+        verifyDiscontinuities(should, renderedData, times, breakThreshold);
+
+    for (let k = 0; k < n; ++k) {
+      let result = comparePartialSignals(
+          should, renderedData, expectedFunction, times[k], times[k + 1],
+          values[k], sampleRate, errorMetric);
+
+      expectedSignal =
+          expectedSignal.concat(Array.prototype.slice.call(result.expected));
+
+      should(
+          result.maxError,
+          'Max error for test ' + k + ' at offset ' +
+              (result.index + timeToSampleFrame(times[k], sampleRate)))
+          .beLessThanOrEqualTo(maxError);
+    }
+
+    should(
+        failedTestCount,
+        'Number of failed tests with an acceptable relative tolerance of ' +
+            maxError)
+        .beEqualTo(0);
+  }
+
+  // Create a function to test the rendered data with the reference data.
+  //
+  // testName - string describing the test
+  //
+  // error - max allowed error between rendered data and the reference data.
+  //
+  // referenceFunction - function that generates the reference data to be
+  // compared with the rendered data.
+  //
+  // jumpThreshold - optional parameter that specifies the threshold to use for
+  // detecting discontinuities.  If not specified, defaults to
+  // discontinuityThreshold.
+  //
+  function checkResultFunction(
+      task, should, testName, error, referenceFunction, jumpThreshold,
+      errorMetric) {
+    return function(event) {
+      let buffer = event.renderedBuffer;
+      renderedData = buffer.getChannelData(0);
+
+      let threshold;
+
+      if (!jumpThreshold) {
+        threshold = discontinuityThreshold;
+      } else {
+        threshold = jumpThreshold;
+      }
+
+      compareSignals(
+          should, testName, error, renderedData, referenceFunction,
+          timeValueInfo, threshold, errorMetric);
+      task.done();
+    }
+  }
+
+  // Run all the automation tests.
+  //
+  // numberOfTests - number of tests (time intervals) to run.
+  //
+  // initialValue - The initial value of the first time interval.
+  //
+  // setValueFunction - function that sets the specified value at the start of a
+  // time interval.
+  //
+  // automationFunction - function that sets the end value for the time
+  // interval. It specifies how the value approaches the end value.
+  //
+  // An object is returned containing an array of start times for each time
+  // interval, and an array giving the start and end values for the interval.
+  function doAutomation(
+      numberOfTests, initialValue, setValueFunction, automationFunction) {
+    let timeInfo = [0];
+    let valueInfo = [];
+    let value = initialValue;
+
+    for (let k = 0; k < numberOfTests; ++k) {
+      let startTime = k * timeInterval;
+      let endTime = (k + 1) * timeInterval;
+      let endValue = value + endValueDelta(k);
+
+      // Set the value at the start of the time interval.
+      setValueFunction(value, startTime);
+
+      // Specify the end or target value, and how we should approach it.
+      automationFunction(endValue, startTime, endTime);
+
+      // Keep track of the start times, and the start and end values for each
+      // time interval.
+      timeInfo.push(endTime);
+      valueInfo.push({startValue: value, endValue: endValue});
+
+      value += valueUpdate(k);
+    }
+
+    return {times: timeInfo, values: valueInfo};
+  }
+
+  // Create the audio graph for the test and then run the test.
+  //
+  // numberOfTests - number of time intervals (tests) to run.
+  //
+  // initialValue - the initial value of the gain at time 0.
+  //
+  // setValueFunction - function to set the value at the beginning of each time
+  // interval.
+  //
+  // automationFunction - the AudioParamTimeline automation function
+  //
+  // testName - string indicating the test that is being run.
+  //
+  // maxError - maximum allowed error between the rendered data and the
+  // reference data
+  //
+  // referenceFunction - function that generates the reference data to be
+  // compared against the rendered data.
+  //
+  // jumpThreshold - optional parameter that specifies the threshold to use for
+  // detecting discontinuities.  If not specified, defaults to
+  // discontinuityThreshold.
+  //
+  function createAudioGraphAndTest(
+      task, should, numberOfTests, initialValue, setValueFunction,
+      automationFunction, testName, maxError, referenceFunction, jumpThreshold,
+      errorMetric) {
+    // Create offline audio context.
+    context =
+        new OfflineAudioContext(2, renderLength(numberOfTests), sampleRate);
+    let constantBuffer =
+        createConstantBuffer(context, renderLength(numberOfTests), 1);
+
+    // We use an AudioGainNode here simply as a convenient way to test the
+    // AudioParam automation, since it's easy to pass a constant value through
+    // the node, automate the .gain attribute and observe the resulting values.
+
+    gainNode = context.createGain();
+
+    let bufferSource = context.createBufferSource();
+    bufferSource.buffer = constantBuffer;
+    bufferSource.connect(gainNode);
+    gainNode.connect(context.destination);
+
+    // Set up default values for the parameters that control how the automation
+    // test values progress for each time interval.
+    startingValueDelta = initialValue / numberOfTests;
+    startEndValueChange = startingValueDelta / 2;
+    discontinuityThreshold = startEndValueChange / 2;
+
+    // Run the automation tests.
+    timeValueInfo = doAutomation(
+        numberOfTests, initialValue, setValueFunction, automationFunction);
+    bufferSource.start(0);
+
+    context.oncomplete = checkResultFunction(
+        task, should, testName, maxError, referenceFunction, jumpThreshold,
+        errorMetric || relativeErrorMetric);
+    context.startRendering();
+  }
+
+  // Export local references to global scope. All the new objects in this file
+  // must be exported through this if it is to be used in the actual test HTML
+  // page.
+  let exports = {
+    'sampleRate': 44100,
+    'gainNode': null,
+    'timeInterval': timeIntervalInternal,
+
+    // Some suitable time constant so that we can see a significant change over
+    // a timeInterval.  This is only needed by setTargetAtTime() which needs a
+    // time constant.
+    'timeConstant': timeIntervalInternal / 3,
+
+    'renderLength': renderLength,
+    'createConstantArray': createConstantArray,
+    'getStartEndFrames': getStartEndFrames,
+    'createLinearRampArray': createLinearRampArray,
+    'createExponentialRampArray': createExponentialRampArray,
+    'discreteTimeConstantForSampleRate': discreteTimeConstantForSampleRate,
+    'createExponentialApproachArray': createExponentialApproachArray,
+    'createReferenceSineArray': createReferenceSineArray,
+    'createSineWaveArray': createSineWaveArray,
+    'endValueDelta': endValueDelta,
+    'relativeErrorMetric': relativeErrorMetric,
+    'differenceErrorMetric': differenceErrorMetric,
+    'valueUpdate': valueUpdate,
+    'comparePartialSignals': comparePartialSignals,
+    'verifyDiscontinuities': verifyDiscontinuities,
+    'compareSignals': compareSignals,
+    'checkResultFunction': checkResultFunction,
+    'doAutomation': doAutomation,
+    'createAudioGraphAndTest': createAudioGraphAndTest
+  };
+
+  for (let reference in exports) {
+    global[reference] = exports[reference];
+  }
+
+})(window);
diff --git a/tests/wpt/web-platform-tests/webaudio/chrome/resources/audit-util.js b/tests/wpt/web-platform-tests/webaudio/chrome/resources/audit-util.js
new file mode 100644
index 0000000000000..4213fda509bfb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/chrome/resources/audit-util.js
@@ -0,0 +1,195 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+
+/**
+ * @fileOverview  This file includes legacy utility functions for the layout
+ *                test.
+ */
+
+// How many frames in a WebAudio render quantum.
+let RENDER_QUANTUM_FRAMES = 128;
+
+// Compare two arrays (commonly extracted from buffer.getChannelData()) with
+// constraints:
+//   options.thresholdSNR: Minimum allowed SNR between the actual and expected
+//     signal. The default value is 10000.
+//   options.thresholdDiffULP: Maximum allowed difference between the actual
+//     and expected signal in ULP(Unit in the last place). The default is 0.
+//   options.thresholdDiffCount: Maximum allowed number of sample differences
+//     which exceeds the threshold. The default is 0.
+//   options.bitDepth: The expected result is assumed to come from an audio
+//     file with this number of bits of precision. The default is 16.
+function compareBuffersWithConstraints(should, actual, expected, options) {
+  if (!options)
+    options = {};
+
+  // Only print out the message if the lengths are different; the
+  // expectation is that they are the same, so don't clutter up the
+  // output.
+  if (actual.length !== expected.length) {
+    should(
+        actual.length === expected.length,
+        'Length of actual and expected buffers should match')
+        .beTrue();
+  }
+
+  let maxError = -1;
+  let diffCount = 0;
+  let errorPosition = -1;
+  let thresholdSNR = (options.thresholdSNR || 10000);
+
+  let thresholdDiffULP = (options.thresholdDiffULP || 0);
+  let thresholdDiffCount = (options.thresholdDiffCount || 0);
+
+  // By default, the bit depth is 16.
+  let bitDepth = (options.bitDepth || 16);
+  let scaleFactor = Math.pow(2, bitDepth - 1);
+
+  let noisePower = 0, signalPower = 0;
+
+  for (let i = 0; i < actual.length; i++) {
+    let diff = actual[i] - expected[i];
+    noisePower += diff * diff;
+    signalPower += expected[i] * expected[i];
+
+    if (Math.abs(diff) > maxError) {
+      maxError = Math.abs(diff);
+      errorPosition = i;
+    }
+
+    // The reference file is a 16-bit WAV file, so we will almost never get
+    // an exact match between it and the actual floating-point result.
+    if (Math.abs(diff) > scaleFactor)
+      diffCount++;
+  }
+
+  let snr = 10 * Math.log10(signalPower / noisePower);
+  let maxErrorULP = maxError * scaleFactor;
+
+  should(snr, 'SNR').beGreaterThanOrEqualTo(thresholdSNR);
+
+  should(
+      maxErrorULP,
+      options.prefix + ': Maximum difference (in ulp units (' + bitDepth +
+          '-bits))')
+      .beLessThanOrEqualTo(thresholdDiffULP);
+
+  should(diffCount, options.prefix + ': Number of differences between results')
+      .beLessThanOrEqualTo(thresholdDiffCount);
+}
+
+// Create an impulse in a buffer of length sampleFrameLength
+function createImpulseBuffer(context, sampleFrameLength) {
+  let audioBuffer =
+      context.createBuffer(1, sampleFrameLength, context.sampleRate);
+  let n = audioBuffer.length;
+  let dataL = audioBuffer.getChannelData(0);
+
+  for (let k = 0; k < n; ++k) {
+    dataL[k] = 0;
+  }
+  dataL[0] = 1;
+
+  return audioBuffer;
+}
+
+// Create a buffer of the given length with a linear ramp having values 0 <= x <
+// 1.
+function createLinearRampBuffer(context, sampleFrameLength) {
+  let audioBuffer =
+      context.createBuffer(1, sampleFrameLength, context.sampleRate);
+  let n = audioBuffer.length;
+  let dataL = audioBuffer.getChannelData(0);
+
+  for (let i = 0; i < n; ++i)
+    dataL[i] = i / n;
+
+  return audioBuffer;
+}
+
+// Create an AudioBuffer of length |sampleFrameLength| having a constant value
+// |constantValue|. If |constantValue| is a number, the buffer has one channel
+// filled with that value. If |constantValue| is an array, the buffer is created
+// wit a number of channels equal to the length of the array, and channel k is
+// filled with the k'th element of the |constantValue| array.
+function createConstantBuffer(context, sampleFrameLength, constantValue) {
+  let channels;
+  let values;
+
+  if (typeof constantValue === 'number') {
+    channels = 1;
+    values = [constantValue];
+  } else {
+    channels = constantValue.length;
+    values = constantValue;
+  }
+
+  let audioBuffer =
+      context.createBuffer(channels, sampleFrameLength, context.sampleRate);
+  let n = audioBuffer.length;
+
+  for (let c = 0; c < channels; ++c) {
+    let data = audioBuffer.getChannelData(c);
+    for (let i = 0; i < n; ++i)
+      data[i] = values[c];
+  }
+
+  return audioBuffer;
+}
+
+// Create a stereo impulse in a buffer of length sampleFrameLength
+function createStereoImpulseBuffer(context, sampleFrameLength) {
+  let audioBuffer =
+      context.createBuffer(2, sampleFrameLength, context.sampleRate);
+  let n = audioBuffer.length;
+  let dataL = audioBuffer.getChannelData(0);
+  let dataR = audioBuffer.getChannelData(1);
+
+  for (let k = 0; k < n; ++k) {
+    dataL[k] = 0;
+    dataR[k] = 0;
+  }
+  dataL[0] = 1;
+  dataR[0] = 1;
+
+  return audioBuffer;
+}
+
+// Convert time (in seconds) to sample frames.
+function timeToSampleFrame(time, sampleRate) {
+  return Math.floor(0.5 + time * sampleRate);
+}
+
+// Compute the number of sample frames consumed by noteGrainOn with
+// the specified |grainOffset|, |duration|, and |sampleRate|.
+function grainLengthInSampleFrames(grainOffset, duration, sampleRate) {
+  let startFrame = timeToSampleFrame(grainOffset, sampleRate);
+  let endFrame = timeToSampleFrame(grainOffset + duration, sampleRate);
+
+  return endFrame - startFrame;
+}
+
+// True if the number is not an infinity or NaN
+function isValidNumber(x) {
+  return !isNaN(x) && (x != Infinity) && (x != -Infinity);
+}
+
+// Compute the (linear) signal-to-noise ratio between |actual| and
+// |expected|.  The result is NOT in dB!  If the |actual| and
+// |expected| have different lengths, the shorter length is used.
+function computeSNR(actual, expected) {
+  let signalPower = 0;
+  let noisePower = 0;
+
+  let length = Math.min(actual.length, expected.length);
+
+  for (let k = 0; k < length; ++k) {
+    let diff = actual[k] - expected[k];
+    signalPower += expected[k] * expected[k];
+    noisePower += diff * diff;
+  }
+
+  return signalPower / noisePower;
+}
diff --git a/tests/wpt/web-platform-tests/webaudio/chrome/resources/audit.js b/tests/wpt/web-platform-tests/webaudio/chrome/resources/audit.js
new file mode 100644
index 0000000000000..fe0e0ce6025b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/chrome/resources/audit.js
@@ -0,0 +1,1317 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+
+/**
+ * @fileOverview  WebAudio layout test utility library. Built around W3C's
+ *                testharness.js. Includes asynchronous test task manager,
+ *                assertion utilities.
+ * @dependency    testharness.js
+ */
+
+
+(function() {
+
+  'use strict';
+
+  // Selected methods from testharness.js.
+  let testharnessProperties = [
+    'test', 'async_test', 'promise_test', 'promise_rejects', 'generate_tests',
+    'setup', 'done', 'assert_true', 'assert_false'
+  ];
+
+  // Check if testharness.js is properly loaded. Throw otherwise.
+  for (let name in testharnessProperties) {
+    if (!self.hasOwnProperty(testharnessProperties[name]))
+      throw new Error('Cannot proceed. testharness.js is not loaded.');
+  }
+})();
+
+
+window.Audit = (function() {
+
+  'use strict';
+
+  function _logPassed(message) {
+    test(function(arg) {
+      assert_true(true);
+    }, message);
+  }
+
+  function _logFailed(message, detail) {
+    test(function() {
+      assert_true(false, detail);
+    }, message);
+  }
+
+  function _throwException(message) {
+    throw new Error(message);
+  }
+
+  // TODO(hongchan): remove this hack after confirming all the tests are
+  // finished correctly. (crbug.com/708817)
+  const _testharnessDone = window.done;
+  window.done = () => {
+    _throwException('Do NOT call done() method from the test code.');
+  };
+
+  // Generate a descriptive string from a target value in various types.
+  function _generateDescription(target, options) {
+    let targetString;
+
+    switch (typeof target) {
+      case 'object':
+        // Handle Arrays.
+        if (target instanceof Array || target instanceof Float32Array ||
+            target instanceof Float64Array || target instanceof Uint8Array) {
+          let arrayElements = target.length < options.numberOfArrayElements ?
+              String(target) :
+              String(target.slice(0, options.numberOfArrayElements)) + '...';
+          targetString = '[' + arrayElements + ']';
+        } else {
+          targetString = '' + String(targetString).split(/[\s\]]/)[1];
+        }
+        break;
+      default:
+        targetString = String(target);
+        break;
+    }
+
+    return targetString;
+  }
+
+  // Return a string suitable for printing one failed element in
+  // |beCloseToArray|.
+  function _formatFailureEntry(index, actual, expected, abserr, threshold) {
+    return '\t[' + index + ']\t' + actual.toExponential(16) + '\t' +
+        expected.toExponential(16) + '\t' + abserr.toExponential(16) + '\t' +
+        (abserr / Math.abs(expected)).toExponential(16) + '\t' +
+        threshold.toExponential(16);
+  }
+
+  // Compute the error threshold criterion for |beCloseToArray|
+  function _closeToThreshold(abserr, relerr, expected) {
+    return Math.max(abserr, relerr * Math.abs(expected));
+  }
+
+  /**
+   * @class Should
+   * @description Assertion subtask for the Audit task.
+   * @param {Task} parentTask           Associated Task object.
+   * @param {Any} actual                Target value to be tested.
+   * @param {String} actualDescription  String description of the test target.
+   */
+  class Should {
+    constructor(parentTask, actual, actualDescription) {
+      this._task = parentTask;
+
+      this._actual = actual;
+      this._actualDescription = (actualDescription || null);
+      this._expected = null;
+      this._expectedDescription = null;
+
+      this._detail = '';
+      this._printActualForFailure = true;
+
+      this._result = null;
+
+      /**
+       * @param {Number} numberOfErrors   Number of errors to be printed.
+       * @param {Number} numberOfArrayElements  Number of array elements to be
+       *                                        printed in the test log.
+       * @param {Boolean} verbose         Verbose output from the assertion.
+       */
+      this._options = {
+        numberOfErrors: 4,
+        numberOfArrayElements: 16,
+        verbose: false
+      };
+    }
+
+    _processArguments(args) {
+      if (args.length === 0)
+        return;
+
+      if (args.length > 0)
+        this._expected = args[0];
+
+      if (typeof args[1] === 'string') {
+        // case 1: (expected, description, options)
+        this._expectedDescription = args[1];
+        Object.assign(this._options, args[2]);
+      } else if (typeof args[1] === 'object') {
+        // case 2: (expected, options)
+        Object.assign(this._options, args[1]);
+      }
+    }
+
+    _buildResultText() {
+      if (this._result === null)
+        _throwException('Illegal invocation: the assertion is not finished.');
+
+      let actualString = _generateDescription(this._actual, this._options);
+
+      // Use generated text when the description is not provided.
+      if (!this._actualDescription)
+        this._actualDescription = actualString;
+
+      if (!this._expectedDescription) {
+        this._expectedDescription =
+            _generateDescription(this._expected, this._options);
+      }
+
+      // For the assertion with a single operand.
+      this._detail =
+          this._detail.replace(/\$\{actual\}/g, this._actualDescription);
+
+      // If there is a second operand (i.e. expected value), we have to build
+      // the string for it as well.
+      if (this._expected !== null) {
+        this._detail =
+            this._detail.replace(/\$\{expected\}/g, this._expectedDescription);
+      }
+
+      // If there is any property in |_options|, replace the property name
+      // with the value.
+      for (let name in this._options) {
+        if (name === 'numberOfErrors' || name === 'numberOfArrayElements' ||
+            name === 'verbose') {
+          continue;
+        }
+
+        // The RegExp key string contains special character. Take care of it.
+        let re = '\$\{' + name + '\}';
+        re = re.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, '\\$1');
+        this._detail = this._detail.replace(
+            new RegExp(re, 'g'), _generateDescription(this._options[name]));
+      }
+
+      // If the test failed, add the actual value at the end.
+      if (this._result === false && this._printActualForFailure === true) {
+        this._detail += ' Got ' + actualString + '.';
+      }
+    }
+
+    _finalize() {
+      if (this._result) {
+        _logPassed('  ' + this._detail);
+      } else {
+        _logFailed('X ' + this._detail);
+      }
+
+      // This assertion is finished, so update the parent task accordingly.
+      this._task.update(this);
+
+      // TODO(hongchan): configurable 'detail' message.
+    }
+
+    _assert(condition, passDetail, failDetail) {
+      this._result = Boolean(condition);
+      this._detail = this._result ? passDetail : failDetail;
+      this._buildResultText();
+      this._finalize();
+
+      return this._result;
+    }
+
+    get result() {
+      return this._result;
+    }
+
+    get detail() {
+      return this._detail;
+    }
+
+    /**
+     * should() assertions.
+     *
+     * @example All the assertions can have 1, 2 or 3 arguments:
+     *   should().doAssert(expected);
+     *   should().doAssert(expected, options);
+     *   should().doAssert(expected, expectedDescription, options);
+     *
+     * @param {Any} expected                  Expected value of the assertion.
+     * @param {String} expectedDescription    Description of expected value.
+     * @param {Object} options                Options for assertion.
+     * @param {Number} options.numberOfErrors Number of errors to be printed.
+     *                                        (if applicable)
+     * @param {Number} options.numberOfArrayElements  Number of array elements
+     *                                                to be printed. (if
+     *                                                applicable)
+     * @notes Some assertions can have additional options for their specific
+     *        testing.
+     */
+
+    /**
+     * Check if |actual| exists.
+     *
+     * @example
+     *   should({}, 'An empty object').exist();
+     * @result
+     *   "PASS   An empty object does exist."
+     */
+    exist() {
+      return this._assert(
+          this._actual !== null && this._actual !== undefined,
+          '${actual} does exist.', '${actual} does not exist.');
+    }
+
+    /**
+     * Check if |actual| operation wrapped in a function throws an exception
+     * with a expected error type correctly. |expected| is optional.
+     *
+     * @example
+     *   should(() => { let a = b; }, 'A bad code').throw();
+     *   should(() => { let c = d; }, 'Assigning d to c.')
+     *       .throw('ReferenceError');
+     *   should(() => { let e = f; }, 'Assigning e to f.')
+     *       .throw('ReferenceError', { omitErrorMessage: true });
+     *
+     * @result
+     *   "PASS   A bad code threw an exception of ReferenceError: b is not
+     *       defined."
+     *   "PASS   Assigning d to c threw ReferenceError: d is not defined."
+     *   "PASS   Assigning e to f threw ReferenceError: [error message
+     *       omitted]."
+     */
+    throw() {
+      this._processArguments(arguments);
+      this._printActualForFailure = false;
+
+      let didThrowCorrectly = false;
+      let passDetail, failDetail;
+
+      try {
+        // This should throw.
+        this._actual();
+        // Catch did not happen, so the test is failed.
+        failDetail = '${actual} did not throw an exception.';
+      } catch (error) {
+        let errorMessage = this._options.omitErrorMessage ?
+            ': [error message omitted]' :
+            ': "' + error.message + '"';
+        if (this._expected === null || this._expected === undefined) {
+          // The expected error type was not given.
+          didThrowCorrectly = true;
+          passDetail = '${actual} threw ' + error.name + errorMessage + '.';
+        } else if (error.name === this._expected) {
+          // The expected error type match the actual one.
+          didThrowCorrectly = true;
+          passDetail = '${actual} threw ${expected}' + errorMessage + '.';
+        } else {
+          didThrowCorrectly = false;
+          failDetail =
+              '${actual} threw "' + error.name + '" instead of ${expected}.';
+        }
+      }
+
+      return this._assert(didThrowCorrectly, passDetail, failDetail);
+    }
+
+    /**
+     * Check if |actual| operation wrapped in a function does not throws an
+     * exception correctly.
+     *
+     * @example
+     *   should(() => { let foo = 'bar'; }, 'let foo = "bar"').notThrow();
+     *
+     * @result
+     *   "PASS   let foo = "bar" did not throw an exception."
+     */
+    notThrow() {
+      this._printActualForFailure = false;
+
+      let didThrowCorrectly = false;
+      let passDetail, failDetail;
+
+      try {
+        this._actual();
+        passDetail = '${actual} did not throw an exception.';
+      } catch (error) {
+        didThrowCorrectly = true;
+        failDetail = '${actual} incorrectly threw ' + error.name + ': "' +
+            error.message + '".';
+      }
+
+      return this._assert(!didThrowCorrectly, passDetail, failDetail);
+    }
+
+    /**
+     * Check if |actual| promise is resolved correctly. Note that the returned
+     * result from promise object will be passed to the following then()
+     * function.
+     *
+     * @example
+     *   should('My promise', promise).beResolve().then((result) => {
+     *     // log(result);
+     *   });
+     *
+     * @result
+     *   "PASS   My promise resolved correctly."
+     *   "FAIL X My promise rejected *INCORRECTLY* with _ERROR_."
+     */
+    beResolved() {
+      return this._actual.then(
+          function(result) {
+            this._assert(true, '${actual} resolved correctly.', null);
+            return result;
+          }.bind(this),
+          function(error) {
+            this._assert(
+                false, null,
+                '${actual} rejected incorrectly with ' + error + '.');
+          }.bind(this));
+    }
+
+    /**
+     * Check if |actual| promise is rejected correctly.
+     *
+     * @example
+     *   should('My promise', promise).beRejected().then(nextStuff);
+     *
+     * @result
+     *   "PASS   My promise rejected correctly (with _ERROR_)."
+     *   "FAIL X My promise resolved *INCORRECTLY*."
+     */
+    beRejected() {
+      return this._actual.then(
+          function() {
+            this._assert(false, null, '${actual} resolved incorrectly.');
+          }.bind(this),
+          function(error) {
+            this._assert(
+                true, '${actual} rejected correctly with ' + error + '.', null);
+          }.bind(this));
+    }
+
+    /**
+     * Check if |actual| promise is rejected correctly.
+     *
+     * @example
+     *   should(promise, 'My promise').beRejectedWith('_ERROR_').then();
+     *
+     * @result
+     *   "PASS   My promise rejected correctly with _ERROR_."
+     *   "FAIL X My promise rejected correctly but got _ACTUAL_ERROR instead of
+     *           _EXPECTED_ERROR_."
+     *   "FAIL X My promise resolved incorrectly."
+     */
+    beRejectedWith() {
+      this._processArguments(arguments);
+
+      return this._actual.then(
+          function() {
+            this._assert(false, null, '${actual} resolved incorrectly.');
+          }.bind(this),
+          function(error) {
+            if (this._expected !== error.name) {
+              this._assert(
+                  false, null,
+                  '${actual} rejected correctly but got ' + error.name +
+                      ' instead of ' + this._expected + '.');
+            } else {
+              this._assert(
+                  true,
+                  '${actual} rejected correctly with ' + this._expected + '.',
+                  null);
+            }
+          }.bind(this));
+    }
+
+    /**
+     * Check if |actual| is a boolean true.
+     *
+     * @example
+     *   should(3 < 5, '3 < 5').beTrue();
+     *
+     * @result
+     *   "PASS   3 < 5 is true."
+     */
+    beTrue() {
+      return this._assert(
+          this._actual === true, '${actual} is true.',
+          '${actual} is not true.');
+    }
+
+    /**
+     * Check if |actual| is a boolean false.
+     *
+     * @example
+     *   should(3 > 5, '3 > 5').beFalse();
+     *
+     * @result
+     *   "PASS   3 > 5 is false."
+     */
+    beFalse() {
+      return this._assert(
+          this._actual === false, '${actual} is false.',
+          '${actual} is not false.');
+    }
+
+    /**
+     * Check if |actual| is strictly equal to |expected|. (no type coercion)
+     *
+     * @example
+     *   should(1).beEqualTo(1);
+     *
+     * @result
+     *   "PASS   1 is equal to 1."
+     */
+    beEqualTo() {
+      this._processArguments(arguments);
+      return this._assert(
+          this._actual === this._expected, '${actual} is equal to ${expected}.',
+          '${actual} is not equal to ${expected}.');
+    }
+
+    /**
+     * Check if |actual| is not equal to |expected|.
+     *
+     * @example
+     *   should(1).notBeEqualTo(2);
+     *
+     * @result
+     *   "PASS   1 is not equal to 2."
+     */
+    notBeEqualTo() {
+      this._processArguments(arguments);
+      return this._assert(
+          this._actual !== this._expected,
+          '${actual} is not equal to ${expected}.',
+          '${actual} should not be equal to ${expected}.');
+    }
+
+    /**
+     * check if |actual| is NaN
+     *
+     * @example
+     *   should(NaN).beNaN();
+     *
+     * @result
+     *   "PASS   NaN is NaN"
+     *
+     */
+    beNaN() {
+      this._processArguments(arguments);
+      return this._assert(
+          isNaN(this._actual),
+          '${actual} is NaN.',
+          '${actual} is not NaN but should be.');
+    }
+
+    /**
+     * check if |actual| is NOT NaN
+     *
+     * @example
+     *   should(42).notBeNaN();
+     *
+     * @result
+     *   "PASS   42 is not NaN"
+     *
+     */
+    notBeNaN() {
+      this._processArguments(arguments);
+      return this._assert(
+          !isNaN(this._actual),
+          '${actual} is not NaN.',
+          '${actual} is NaN but should not be.');
+    }
+
+    /**
+     * Check if |actual| is greater than |expected|.
+     *
+     * @example
+     *   should(2).beGreaterThanOrEqualTo(2);
+     *
+     * @result
+     *   "PASS   2 is greater than or equal to 2."
+     */
+    beGreaterThan() {
+      this._processArguments(arguments);
+      return this._assert(
+          this._actual > this._expected,
+          '${actual} is greater than ${expected}.',
+          '${actual} is not greater than ${expected}.');
+    }
+
+    /**
+     * Check if |actual| is greater than or equal to |expected|.
+     *
+     * @example
+     *   should(2).beGreaterThan(1);
+     *
+     * @result
+     *   "PASS   2 is greater than 1."
+     */
+    beGreaterThanOrEqualTo() {
+      this._processArguments(arguments);
+      return this._assert(
+          this._actual >= this._expected,
+          '${actual} is greater than or equal to ${expected}.',
+          '${actual} is not greater than or equal to ${expected}.');
+    }
+
+    /**
+     * Check if |actual| is less than |expected|.
+     *
+     * @example
+     *   should(1).beLessThan(2);
+     *
+     * @result
+     *   "PASS   1 is less than 2."
+     */
+    beLessThan() {
+      this._processArguments(arguments);
+      return this._assert(
+          this._actual < this._expected, '${actual} is less than ${expected}.',
+          '${actual} is not less than ${expected}.');
+    }
+
+    /**
+     * Check if |actual| is less than or equal to |expected|.
+     *
+     * @example
+     *   should(1).beLessThanOrEqualTo(1);
+     *
+     * @result
+     *   "PASS   1 is less than or equal to 1."
+     */
+    beLessThanOrEqualTo() {
+      this._processArguments(arguments);
+      return this._assert(
+          this._actual <= this._expected,
+          '${actual} is less than or equal to ${expected}.',
+          '${actual} is not less than or equal to ${expected}.');
+    }
+
+    /**
+     * Check if |actual| array is filled with a constant |expected| value.
+     *
+     * @example
+     *   should([1, 1, 1]).beConstantValueOf(1);
+     *
+     * @result
+     *   "PASS   [1,1,1] contains only the constant 1."
+     */
+    beConstantValueOf() {
+      this._processArguments(arguments);
+      this._printActualForFailure = false;
+
+      let passed = true;
+      let passDetail, failDetail;
+      let errors = {};
+
+      let actual = this._actual;
+      let expected = this._expected;
+      for (let index = 0; index < actual.length; ++index) {
+        if (actual[index] !== expected)
+          errors[index] = actual[index];
+      }
+
+      let numberOfErrors = Object.keys(errors).length;
+      passed = numberOfErrors === 0;
+
+      if (passed) {
+        passDetail = '${actual} contains only the constant ${expected}.';
+      } else {
+        let counter = 0;
+        failDetail = 'Expected ${expected} for all values but found ' +
+            numberOfErrors + ' unexpected values: ';
+        failDetail += '\n\tIndex\tActual';
+        for (let errorIndex in errors) {
+          failDetail += '\n\t[' + errorIndex + ']' +
+              '\t' + errors[errorIndex];
+          if (++counter >= this._options.numberOfErrors) {
+            failDetail +=
+                '\n\t...and ' + (numberOfErrors - counter) + ' more errors.';
+            break;
+          }
+        }
+      }
+
+      return this._assert(passed, passDetail, failDetail);
+    }
+
+    /**
+     * Check if |actual| array is not filled with a constant |expected| value.
+     *
+     * @example
+     *   should([1, 0, 1]).notBeConstantValueOf(1);
+     *   should([0, 0, 0]).notBeConstantValueOf(0);
+     *
+     * @result
+     *   "PASS   [1,0,1] is not constantly 1 (contains 1 different value)."
+     *   "FAIL X [0,0,0] should have contain at least one value different
+     *     from 0."
+     */
+    notBeConstantValueOf() {
+      this._processArguments(arguments);
+      this._printActualForFailure = false;
+
+      let passed = true;
+      let passDetail;
+      let failDetail;
+      let differences = {};
+
+      let actual = this._actual;
+      let expected = this._expected;
+      for (let index = 0; index < actual.length; ++index) {
+        if (actual[index] !== expected)
+          differences[index] = actual[index];
+      }
+
+      let numberOfDifferences = Object.keys(differences).length;
+      passed = numberOfDifferences > 0;
+
+      if (passed) {
+        let valueString = numberOfDifferences > 1 ? 'values' : 'value';
+        passDetail = '${actual} is not constantly ${expected} (contains ' +
+            numberOfDifferences + ' different ' + valueString + ').';
+      } else {
+        failDetail = '${actual} should have contain at least one value ' +
+            'different from ${expected}.';
+      }
+
+      return this._assert(passed, passDetail, failDetail);
+    }
+
+    /**
+     * Check if |actual| array is identical to |expected| array element-wise.
+     *
+     * @example
+     *   should([1, 2, 3]).beEqualToArray([1, 2, 3]);
+     *
+     * @result
+     *   "[1,2,3] is identical to the array [1,2,3]."
+     */
+    beEqualToArray() {
+      this._processArguments(arguments);
+      this._printActualForFailure = false;
+
+      let passed = true;
+      let passDetail, failDetail;
+      let errorIndices = [];
+
+      if (this._actual.length !== this._expected.length) {
+        passed = false;
+        failDetail = 'The array length does not match.';
+        return this._assert(passed, passDetail, failDetail);
+      }
+
+      let actual = this._actual;
+      let expected = this._expected;
+      for (let index = 0; index < actual.length; ++index) {
+        if (actual[index] !== expected[index])
+          errorIndices.push(index);
+      }
+
+      passed = errorIndices.length === 0;
+
+      if (passed) {
+        passDetail = '${actual} is identical to the array ${expected}.';
+      } else {
+        let counter = 0;
+        failDetail =
+            '${actual} expected to be equal to the array ${expected} ' +
+            'but differs in ' + errorIndices.length + ' places:' +
+            '\n\tIndex\tActual\t\t\tExpected';
+        for (let index of errorIndices) {
+          failDetail += '\n\t[' + index + ']' +
+              '\t' + this._actual[index].toExponential(16) + '\t' +
+              this._expected[index].toExponential(16);
+          if (++counter >= this._options.numberOfErrors) {
+            failDetail += '\n\t...and ' + (errorIndices.length - counter) +
+                ' more errors.';
+            break;
+          }
+        }
+      }
+
+      return this._assert(passed, passDetail, failDetail);
+    }
+
+    /**
+     * Check if |actual| array contains only the values in |expected| in the
+     * order of values in |expected|.
+     *
+     * @example
+     *   Should([1, 1, 3, 3, 2], 'My random array').containValues([1, 3, 2]);
+     *
+     * @result
+     *   "PASS   [1,1,3,3,2] contains all the expected values in the correct
+     *           order: [1,3,2].
+     */
+    containValues() {
+      this._processArguments(arguments);
+      this._printActualForFailure = false;
+
+      let passed = true;
+      let indexedActual = [];
+      let firstErrorIndex = null;
+
+      // Collect the unique value sequence from the actual.
+      for (let i = 0, prev = null; i < this._actual.length; i++) {
+        if (this._actual[i] !== prev) {
+          indexedActual.push({index: i, value: this._actual[i]});
+          prev = this._actual[i];
+        }
+      }
+
+      // Compare against the expected sequence.
+      for (let j = 0; j < this._expected.length; j++) {
+        if (this._expected[j] !== indexedActual[j].value) {
+          firstErrorIndex = indexedActual[j].index;
+          passed = false;
+          break;
+        }
+      }
+
+      return this._assert(
+          passed,
+          '${actual} contains all the expected values in the correct order: ' +
+              '${expected}.',
+          '${actual} expected to have the value sequence of ${expected} but ' +
+              'got ' + this._actual[firstErrorIndex] + ' at index ' +
+              firstErrorIndex + '.');
+    }
+
+    /**
+     * Check if |actual| array does not have any glitches. Note that |threshold|
+     * is not optional and is to define the desired threshold value.
+     *
+     * @example
+     *   should([0.5, 0.5, 0.55, 0.5, 0.45, 0.5]).notGlitch(0.06);
+     *
+     * @result
+     *   "PASS   [0.5,0.5,0.55,0.5,0.45,0.5] has no glitch above the threshold
+     *           of 0.06."
+     *
+     */
+    notGlitch() {
+      this._processArguments(arguments);
+      this._printActualForFailure = false;
+
+      let passed = true;
+      let passDetail, failDetail;
+
+      let actual = this._actual;
+      let expected = this._expected;
+      for (let index = 0; index < actual.length; ++index) {
+        let diff = Math.abs(actual[index - 1] - actual[index]);
+        if (diff >= expected) {
+          passed = false;
+          failDetail = '${actual} has a glitch at index ' + index +
+              ' of size ' + diff + '.';
+        }
+      }
+
+      passDetail =
+          '${actual} has no glitch above the threshold of ${expected}.';
+
+      return this._assert(passed, passDetail, failDetail);
+    }
+
+    /**
+     * Check if |actual| is close to |expected| using the given relative error
+     * |threshold|.
+     *
+     * @example
+     *   should(2.3).beCloseTo(2, { threshold: 0.3 });
+     *
+     * @result
+     *   "PASS    2.3 is 2 within an error of 0.3."
+     * @param {Object} options              Options for assertion.
+     * @param {Number} options.threshold    Threshold value for the comparison.
+     */
+    beCloseTo() {
+      this._processArguments(arguments);
+
+      // The threshold is relative except when |expected| is zero, in which case
+      // it is absolute.
+      let absExpected = this._expected ? Math.abs(this._expected) : 1;
+      let error = Math.abs(this._actual - this._expected) / absExpected;
+
+      // debugger;
+
+      return this._assert(
+          error <= this._options.threshold,
+          '${actual} is ${expected} within an error of ${threshold}.',
+          '${actual} is not close to ${expected} within a relative error of ' +
+              '${threshold} (RelErr=' + error + ').');
+    }
+
+    /**
+     * Check if |target| array is close to |expected| array element-wise within
+     * a certain error bound given by the |options|.
+     *
+     * The error criterion is:
+     *   abs(actual[k] - expected[k]) < max(absErr, relErr * abs(expected))
+     *
+     * If nothing is given for |options|, then absErr = relErr = 0. If
+     * absErr = 0, then the error criterion is a relative error. A non-zero
+     * absErr value produces a mix intended to handle the case where the
+     * expected value is 0, allowing the target value to differ by absErr from
+     * the expected.
+     *
+     * @param {Number} options.absoluteThreshold    Absolute threshold.
+     * @param {Number} options.relativeThreshold    Relative threshold.
+     */
+    beCloseToArray() {
+      this._processArguments(arguments);
+      this._printActualForFailure = false;
+
+      let passed = true;
+      let passDetail, failDetail;
+
+      // Parsing options.
+      let absErrorThreshold = (this._options.absoluteThreshold || 0);
+      let relErrorThreshold = (this._options.relativeThreshold || 0);
+
+      // A collection of all of the values that satisfy the error criterion.
+      // This holds the absolute difference between the target element and the
+      // expected element.
+      let errors = {};
+
+      // Keep track of the max absolute error found.
+      let maxAbsError = -Infinity, maxAbsErrorIndex = -1;
+
+      // Keep track of the max relative error found, ignoring cases where the
+      // relative error is Infinity because the expected value is 0.
+      let maxRelError = -Infinity, maxRelErrorIndex = -1;
+
+      let actual = this._actual;
+      let expected = this._expected;
+
+      for (let index = 0; index < expected.length; ++index) {
+        let diff = Math.abs(actual[index] - expected[index]);
+        let absExpected = Math.abs(expected[index]);
+        let relError = diff / absExpected;
+
+        if (diff >
+            Math.max(absErrorThreshold, relErrorThreshold * absExpected)) {
+          if (diff > maxAbsError) {
+            maxAbsErrorIndex = index;
+            maxAbsError = diff;
+          }
+
+          if (!isNaN(relError) && relError > maxRelError) {
+            maxRelErrorIndex = index;
+            maxRelError = relError;
+          }
+
+          errors[index] = diff;
+        }
+      }
+
+      let numberOfErrors = Object.keys(errors).length;
+      let maxAllowedErrorDetail = JSON.stringify({
+        absoluteThreshold: absErrorThreshold,
+        relativeThreshold: relErrorThreshold
+      });
+
+      if (numberOfErrors === 0) {
+        // The assertion was successful.
+        passDetail = '${actual} equals ${expected} with an element-wise ' +
+            'tolerance of ' + maxAllowedErrorDetail + '.';
+      } else {
+        // Failed. Prepare the detailed failure log.
+        passed = false;
+        failDetail = '${actual} does not equal ${expected} with an ' +
+            'element-wise tolerance of ' + maxAllowedErrorDetail + '.\n';
+
+        // Print out actual, expected, absolute error, and relative error.
+        let counter = 0;
+        failDetail += '\tIndex\tActual\t\t\tExpected\t\tAbsError' +
+            '\t\tRelError\t\tTest threshold';
+        let printedIndices = [];
+        for (let index in errors) {
+          failDetail +=
+              '\n' +
+              _formatFailureEntry(
+                  index, actual[index], expected[index], errors[index],
+                  _closeToThreshold(
+                      absErrorThreshold, relErrorThreshold, expected[index]));
+
+          printedIndices.push(index);
+          if (++counter > this._options.numberOfErrors) {
+            failDetail +=
+                '\n\t...and ' + (numberOfErrors - counter) + ' more errors.';
+            break;
+          }
+        }
+
+        // Finalize the error log: print out the location of both the maxAbs
+        // error and the maxRel error so we can adjust thresholds appropriately
+        // in the test.
+        failDetail += '\n' +
+            '\tMax AbsError of ' + maxAbsError.toExponential(16) +
+            ' at index of ' + maxAbsErrorIndex + '.\n';
+        if (printedIndices.find(element => {
+              return element == maxAbsErrorIndex;
+            }) === undefined) {
+          // Print an entry for this index if we haven't already.
+          failDetail +=
+              _formatFailureEntry(
+                  maxAbsErrorIndex, actual[maxAbsErrorIndex],
+                  expected[maxAbsErrorIndex], errors[maxAbsErrorIndex],
+                  _closeToThreshold(
+                      absErrorThreshold, relErrorThreshold,
+                      expected[maxAbsErrorIndex])) +
+              '\n';
+        }
+        failDetail += '\tMax RelError of ' + maxRelError.toExponential(16) +
+            ' at index of ' + maxRelErrorIndex + '.\n';
+        if (printedIndices.find(element => {
+              return element == maxRelErrorIndex;
+            }) === undefined) {
+          // Print an entry for this index if we haven't already.
+          failDetail +=
+              _formatFailureEntry(
+                  maxRelErrorIndex, actual[maxRelErrorIndex],
+                  expected[maxRelErrorIndex], errors[maxRelErrorIndex],
+                  _closeToThreshold(
+                      absErrorThreshold, relErrorThreshold,
+                      expected[maxRelErrorIndex])) +
+              '\n';
+        }
+      }
+
+      return this._assert(passed, passDetail, failDetail);
+    }
+
+    /**
+     * A temporary escape hat for printing an in-task message. The description
+     * for the |actual| is required to get the message printed properly.
+     *
+     * TODO(hongchan): remove this method when the transition from the old Audit
+     * to the new Audit is completed.
+     * @example
+     *   should(true, 'The message is').message('truthful!', 'false!');
+     *
+     * @result
+     *   "PASS   The message is truthful!"
+     */
+    message(passDetail, failDetail) {
+      return this._assert(
+          this._actual, '${actual} ' + passDetail, '${actual} ' + failDetail);
+    }
+
+    /**
+     * Check if |expected| property is truly owned by |actual| object.
+     *
+     * @example
+     *   should(BaseAudioContext.prototype,
+     *          'BaseAudioContext.prototype').haveOwnProperty('createGain');
+     *
+     * @result
+     *   "PASS   BaseAudioContext.prototype has an own property of
+     *       'createGain'."
+     */
+    haveOwnProperty() {
+      this._processArguments(arguments);
+
+      return this._assert(
+          this._actual.hasOwnProperty(this._expected),
+          '${actual} has an own property of "${expected}".',
+          '${actual} does not own the property of "${expected}".');
+    }
+
+
+    /**
+     * Check if |expected| property is not owned by |actual| object.
+     *
+     * @example
+     *   should(BaseAudioContext.prototype,
+     *          'BaseAudioContext.prototype')
+     *       .notHaveOwnProperty('startRendering');
+     *
+     * @result
+     *   "PASS   BaseAudioContext.prototype does not have an own property of
+     *       'startRendering'."
+     */
+    notHaveOwnProperty() {
+      this._processArguments(arguments);
+
+      return this._assert(
+          !this._actual.hasOwnProperty(this._expected),
+          '${actual} does not have an own property of "${expected}".',
+          '${actual} has an own the property of "${expected}".')
+    }
+
+
+    /**
+     * Check if an object is inherited from a class. This looks up the entire
+     * prototype chain of a given object and tries to find a match.
+     *
+     * @example
+     *   should(sourceNode, 'A buffer source node')
+     *       .inheritFrom('AudioScheduledSourceNode');
+     *
+     * @result
+     *   "PASS   A buffer source node inherits from 'AudioScheduledSourceNode'."
+     */
+    inheritFrom() {
+      this._processArguments(arguments);
+
+      let prototypes = [];
+      let currentPrototype = Object.getPrototypeOf(this._actual);
+      while (currentPrototype) {
+        prototypes.push(currentPrototype.constructor.name);
+        currentPrototype = Object.getPrototypeOf(currentPrototype);
+      }
+
+      return this._assert(
+          prototypes.includes(this._expected),
+          '${actual} inherits from "${expected}".',
+          '${actual} does not inherit from "${expected}".');
+    }
+  }
+
+
+  // Task Class state enum.
+  const TaskState = {PENDING: 0, STARTED: 1, FINISHED: 2};
+
+
+  /**
+   * @class Task
+   * @description WebAudio testing task. Managed by TaskRunner.
+   */
+  class Task {
+    /**
+     * Task constructor.
+     * @param  {Object} taskRunner Reference of associated task runner.
+     * @param  {String||Object} taskLabel Task label if a string is given. This
+     *                                    parameter can be a dictionary with the
+     *                                    following fields.
+     * @param  {String} taskLabel.label Task label.
+     * @param  {String} taskLabel.description Description of task.
+     * @param  {Function} taskFunction Task function to be performed.
+     * @return {Object} Task object.
+     */
+    constructor(taskRunner, taskLabel, taskFunction) {
+      this._taskRunner = taskRunner;
+      this._taskFunction = taskFunction;
+
+      if (typeof taskLabel === 'string') {
+        this._label = taskLabel;
+        this._description = null;
+      } else if (typeof taskLabel === 'object') {
+        if (typeof taskLabel.label !== 'string') {
+          _throwException('Task.constructor:: task label must be string.');
+        }
+        this._label = taskLabel.label;
+        this._description = (typeof taskLabel.description === 'string') ?
+            taskLabel.description :
+            null;
+      } else {
+        _throwException(
+            'Task.constructor:: task label must be a string or ' +
+            'a dictionary.');
+      }
+
+      this._state = TaskState.PENDING;
+      this._result = true;
+
+      this._totalAssertions = 0;
+      this._failedAssertions = 0;
+    }
+
+    get label() {
+      return this._label;
+    }
+
+    get state() {
+      return this._state;
+    }
+
+    get result() {
+      return this._result;
+    }
+
+    // Start the assertion chain.
+    should(actual, actualDescription) {
+      // If no argument is given, we cannot proceed. Halt.
+      if (arguments.length === 0)
+        _throwException('Task.should:: requires at least 1 argument.');
+
+      return new Should(this, actual, actualDescription);
+    }
+
+    // Run this task. |this| task will be passed into the user-supplied test
+    // task function.
+    run() {
+      this._state = TaskState.STARTED;
+
+      // Print out the task entry with label and description.
+      _logPassed(
+          '> [' + this._label + '] ' +
+          (this._description ? this._description : ''));
+
+      this._taskFunction(this, this.should.bind(this));
+    }
+
+    // Update the task success based on the individual assertion/test inside.
+    update(subTask) {
+      // After one of tests fails within a task, the result is irreversible.
+      if (subTask.result === false) {
+        this._result = false;
+        this._failedAssertions++;
+      }
+
+      this._totalAssertions++;
+    }
+
+    // Finish the current task and start the next one if available.
+    done() {
+      this._state = TaskState.FINISHED;
+
+      let message = '< [' + this._label + '] ';
+
+      if (this._result) {
+        message += 'All assertions passed. (total ' + this._totalAssertions +
+            ' assertions)';
+        _logPassed(message);
+      } else {
+        message += this._failedAssertions + ' out of ' + this._totalAssertions +
+            ' assertions were failed.'
+        _logFailed(message);
+      }
+
+      this._taskRunner._runNextTask();
+    }
+
+    isPassed() {
+      return this._state === TaskState.FINISHED && this._result;
+    }
+
+    toString() {
+      return '"' + this._label + '": ' + this._description;
+    }
+  }
+
+
+  /**
+   * @class TaskRunner
+   * @description WebAudio testing task runner. Manages tasks.
+   */
+  class TaskRunner {
+    constructor() {
+      this._tasks = {};
+      this._taskSequence = [];
+      this._currentTaskIndex = -1;
+
+      // Configure testharness.js for the async operation.
+      setup(new Function(), {explicit_done: true});
+    }
+
+    _runNextTask() {
+      if (this._currentTaskIndex < this._taskSequence.length) {
+        this._tasks[this._taskSequence[this._currentTaskIndex++]].run();
+      } else {
+        this._finish();
+      }
+    }
+
+    _finish() {
+      let numberOfFailures = 0;
+      for (let taskIndex in this._taskSequence) {
+        let task = this._tasks[this._taskSequence[taskIndex]];
+        numberOfFailures += task.result ? 0 : 1;
+      }
+
+      let prefix = '# AUDIT TASK RUNNER FINISHED: ';
+      if (numberOfFailures > 0) {
+        _logFailed(
+            prefix + numberOfFailures + ' out of ' + this._taskSequence.length +
+            ' tasks were failed.');
+      } else {
+        _logPassed(
+            prefix + this._taskSequence.length + ' tasks ran successfully.');
+      }
+
+      // From testharness.js, report back to the test infrastructure that
+      // the task runner completed all the tasks.
+      _testharnessDone();
+    }
+
+    // |taskLabel| can be either a string or a dictionary. See Task constructor
+    // for the detail.
+    define(taskLabel, taskFunction) {
+      let task = new Task(this, taskLabel, taskFunction);
+      if (this._tasks.hasOwnProperty(task.label)) {
+        _throwException('Audit.define:: Duplicate task definition.');
+        return;
+      }
+      this._tasks[task.label] = task;
+      this._taskSequence.push(task.label);
+    }
+
+    // Start running all the tasks scheduled. Multiple task names can be passed
+    // to execute them sequentially. Zero argument will perform all defined
+    // tasks in the order of definition.
+    run() {
+      // Display the beginning of the test suite.
+      _logPassed('# AUDIT TASK RUNNER STARTED.');
+
+      // If the argument is specified, override the default task sequence with
+      // the specified one.
+      if (arguments.length > 0) {
+        this._taskSequence = [];
+        for (let i = 0; i < arguments.length; i++) {
+          let taskLabel = arguments[i];
+          if (!this._tasks.hasOwnProperty(taskLabel)) {
+            _throwException('Audit.run:: undefined task.');
+          } else if (this._taskSequence.includes(taskLabel)) {
+            _throwException('Audit.run:: duplicate task request.');
+          } else {
+            this._taskSequence.push(taskLabel);
+          }
+        }
+      }
+
+      if (this._taskSequence.length === 0) {
+        _throwException('Audit.run:: no task to run.');
+        return;
+      }
+
+      // Start the first task.
+      this._currentTaskIndex = 0;
+      this._runNextTask();
+    }
+  }
+
+  /**
+   * @class Audit
+   * @description A WebAudio layout test task manager.
+   * @example
+   *   let audit = Audit.createTaskRunner();
+   *   audit.define('first-task', function (task, should) {
+   *     should(someValue).beEqualTo(someValue);
+   *     task.done();
+   *   });
+   *   audit.run();
+   */
+  return {
+
+    /**
+     * Creates an instance of Audit task runner.
+     * @param {Object}  options                     Options for task runner.
+     * @param {Boolean} options.requireResultFile   True if the test suite
+     *                                              requires explicit text
+     *                                              comparison with the expected
+     *                                              result file.
+     */
+    createTaskRunner: function(options) {
+      if (options && options.requireResultFile == true) {
+        _logError(
+            'this test requires the explicit comparison with the ' +
+            'expected result when it runs with run-webkit-tests.');
+      }
+
+      return new TaskRunner();
+    },
+
+  };
+
+})();
diff --git a/tests/wpt/web-platform-tests/webaudio/chrome/resources/start-stop-exceptions.js b/tests/wpt/web-platform-tests/webaudio/chrome/resources/start-stop-exceptions.js
new file mode 100644
index 0000000000000..99a93f502d366
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/chrome/resources/start-stop-exceptions.js
@@ -0,0 +1,45 @@
+// Test that exceptions are throw for invalid values for start and
+// stop.
+function testStartStop(should, node, options) {
+  // Test non-finite values for start.  These should all throw a TypeError
+  const nonFiniteValues = [NaN, Infinity, -Infinity];
+
+  nonFiniteValues.forEach(time => {
+      should(() => {
+        node.start(time);
+      }, `start(${time})`)
+    .throw('TypeError');
+    });
+
+  should(() => {
+    node.stop();
+  }, 'Calling stop() before start()').throw('InvalidStateError');
+
+  should(() => {
+    node.start(-1);
+  }, 'start(-1)').throw('RangeError');
+
+  if (options) {
+    options.forEach(test => {
+      should(() => {node.start(...test.args)},
+             'start(' + test.args + ')').throw(test.errorType);
+    });
+  }
+
+  node.start();
+  should(() => {
+    node.start();
+  }, 'Calling start() twice').throw('InvalidStateError');
+  should(() => {
+    node.stop(-1);
+  }, 'stop(-1)').throw('RangeError');
+
+  // Test non-finite stop times
+  nonFiniteValues.forEach(time => {
+      should(() => {
+        node.stop(time);
+      }, `stop(${time})`)
+    .throw('TypeError');
+    });
+}
+
diff --git a/tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-basic.html b/tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-basic.html
new file mode 100644
index 0000000000000..caab966422bda
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-basic.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Basic ConstantSourceNode Tests
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="../resources/audit-util.js"></script>
+    <script src="../resources/audit.js"></script>
+    <script src="../resources/start-stop-exceptions.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let context = new AudioContext();
+
+      let audit = Audit.createTaskRunner();
+
+      audit.define('createConstantSource()', (task, should) => {
+        let node;
+        let prefix = 'Factory method: ';
+
+        should(() => {
+          node = context.createConstantSource();
+        }, prefix + 'node = context.createConstantSource()').notThrow();
+        should(
+            node instanceof ConstantSourceNode,
+            prefix + 'node instance of ConstantSourceNode')
+            .beEqualTo(true);
+
+        verifyNodeDefaults(should, node, prefix);
+
+        task.done();
+      });
+
+      audit.define('new ConstantSourceNode()', (task, should) => {
+        let node;
+        let prefix = 'Constructor: ';
+
+        should(() => {
+          node = new ConstantSourceNode(context);
+        }, prefix + 'node = new ConstantSourceNode()').notThrow();
+        should(
+            node instanceof ConstantSourceNode,
+            prefix + 'node instance of ConstantSourceNode')
+            .beEqualTo(true);
+
+
+        verifyNodeDefaults(should, node, prefix);
+
+        task.done();
+      });
+
+      audit.define('start/stop exceptions', (task, should) => {
+        let node = new ConstantSourceNode(context);
+
+        testStartStop(should, node);
+        task.done();
+      });
+
+      function verifyNodeDefaults(should, node, prefix) {
+        should(node.numberOfInputs, prefix + 'node.numberOfInputs')
+            .beEqualTo(0);
+        should(node.numberOfOutputs, prefix + 'node.numberOfOutputs')
+            .beEqualTo(1);
+        should(node.channelCount, prefix + 'node.channelCount').beEqualTo(2);
+        should(node.channelCountMode, prefix + 'node.channelCountMode')
+            .beEqualTo('max');
+        should(
+            node.channelInterpretation, prefix + 'node.channelInterpretation')
+            .beEqualTo('speakers');
+
+        should(node.offset.value, prefix + 'node.offset.value').beEqualTo(1);
+        should(node.offset.defaultValue, prefix + 'node.offset.defaultValue')
+            .beEqualTo(1);
+        should(node.offset.minValue, prefix + 'node.offset.minValue')
+            .beEqualTo(Math.fround(-3.4028235e38));
+        should(node.offset.maxValue, prefix + 'node.offset.maxValue')
+            .beEqualTo(Math.fround(3.4028235e38));
+      }
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-onended.html b/tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-onended.html
new file mode 100644
index 0000000000000..64bc54f21b32f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-onended.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test ConstantSourceNode onended
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let sampleRate = 44100.0;
+      // Number of frames that the source will run; fairly arbitrary
+      let numberOfFrames = 32;
+      // Number of frames to render; arbitrary, but should be larger than
+      // numberOfFrames;
+      let renderFrames = 16 * numberOfFrames;
+
+      let context = new OfflineAudioContext(1, renderFrames, sampleRate);
+      let src = new ConstantSourceNode(context);
+      src.connect(context.destination);
+
+      let tester = async_test('ConstantSourceNode onended event fired');
+
+      src.onended = function() {
+        tester.step(function() {
+          assert_true(true, 'ConstantSourceNode.onended fired');
+        });
+        tester.done();
+      };
+
+      src.start();
+      src.stop(numberOfFrames / context.sampleRate);
+
+      context.startRendering();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-output.html b/tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-output.html
new file mode 100644
index 0000000000000..684bab8b459ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/chrome/the-constantsourcenode-interface/constant-source-output.html
@@ -0,0 +1,175 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test ConstantSourceNode Output
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="../resources/audit-util.js"></script>
+    <script src="../resources/audit.js"></script>
+    <script src="../resources/audioparam-testing.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let sampleRate = 48000;
+      let renderDuration = 0.125;
+      let renderFrames = sampleRate * renderDuration;
+
+      let audit = Audit.createTaskRunner();
+
+      audit.define('constant source', (task, should) => {
+        // Verify a constant source outputs the correct (fixed) constant.
+        let context = new OfflineAudioContext(1, renderFrames, sampleRate);
+        let node = new ConstantSourceNode(context, {offset: 0.5});
+        node.connect(context.destination);
+        node.start();
+
+        context.startRendering()
+            .then(function(buffer) {
+              let actual = buffer.getChannelData(0);
+              let expected = new Float32Array(actual.length);
+              expected.fill(node.offset.value);
+
+              should(actual, 'Basic: ConstantSourceNode({offset: 0.5})')
+                  .beEqualToArray(expected);
+            })
+            .then(() => task.done());
+      });
+
+      audit.define('start/stop', (task, should) => {
+        // Verify a constant source starts and stops at the correct time and has
+        // the correct (fixed) value.
+        let context = new OfflineAudioContext(1, renderFrames, sampleRate);
+        let node = new ConstantSourceNode(context, {offset: 1});
+        node.connect(context.destination);
+
+        let startFrame = 10;
+        let stopFrame = 300;
+
+        node.start(startFrame / context.sampleRate);
+        node.stop(stopFrame / context.sampleRate);
+
+        context.startRendering()
+            .then(function(buffer) {
+              let actual = buffer.getChannelData(0);
+              let expected = new Float32Array(actual.length);
+              // The expected output is all 1s from start to stop time.
+              expected.fill(0);
+
+              for (let k = startFrame; k < stopFrame; ++k) {
+                expected[k] = node.offset.value;
+              }
+
+              let prefix = 'start/stop: ';
+              should(actual.slice(
+                         0, startFrame,
+                         prefix + 'ConstantSourceNode frames [0, ' +
+                             startFrame + ')'))
+                  .beConstantValueOf(0);
+
+              should(actual.slice(
+                         startFrame, stopFrame,
+                         prefix + 'ConstantSourceNode frames [' + startFrame +
+                             ', ' + stopFrame + ')'))
+                  .beConstantValueOf(1);
+
+              should(
+                  actual.slice(stopFrame),
+                  prefix + 'ConstantSourceNode frames [' + stopFrame + ', ' +
+                      renderFrames + ')')
+                  .beConstantValueOf(0);
+            })
+            .then(() => task.done());
+
+      });
+
+      audit.define('basic automation', (task, should) => {
+        // Verify that automation works as expected.
+        let context = new OfflineAudioContext(1, renderFrames, sampleRate);
+        let source = context.createConstantSource();
+        source.connect(context.destination);
+
+        let rampEndTime = renderDuration / 2;
+        source.offset.setValueAtTime(0.5, 0);
+        source.offset.linearRampToValueAtTime(1, rampEndTime);
+
+        source.start();
+
+        context.startRendering()
+            .then(function(buffer) {
+              let actual = buffer.getChannelData(0);
+              let expected = createLinearRampArray(
+                  0, rampEndTime, 0.5, 1, context.sampleRate);
+
+              let rampEndFrame = Math.ceil(rampEndTime * context.sampleRate);
+              let prefix = 'Automation: ';
+
+              should(actual.slice(
+                         0, rampEndFrame,
+                         prefix + 'ConstantSourceNode.linearRamp(1, 0.5)'))
+                  .beCloseToArray(expected, {
+                    // Experimentally determined threshold..
+                    relativeThreshold: 7.1610e-7
+                  });
+
+              should(
+                  actual.slice(rampEndFrame),
+                  prefix + 'ConstantSourceNode after ramp')
+                  .beConstantValueOf(1);
+            })
+            .then(() => task.done());
+      });
+
+      audit.define('connected audioparam', (task, should) => {
+        // Verify the constant source output with connected AudioParam produces
+        // the correct output.
+        let context = new OfflineAudioContext(2, renderFrames, sampleRate)
+        context.destination.channelInterpretation = 'discrete';
+        let source = new ConstantSourceNode(context, {offset: 1});
+        let osc = context.createOscillator();
+        let merger = context.createChannelMerger(2);
+        merger.connect(context.destination);
+
+        source.connect(merger, 0, 0);
+        osc.connect(merger, 0, 1);
+        osc.connect(source.offset);
+
+        osc.start();
+        let sourceStartFrame = 10;
+        source.start(sourceStartFrame / context.sampleRate);
+
+        context.startRendering()
+            .then(function(buffer) {
+              // Channel 0 and 1 should be identical, except channel 0 (the
+              // source) is silent at the beginning.
+              let actual = buffer.getChannelData(0);
+              let expected = buffer.getChannelData(1);
+              // The expected output should be oscillator + 1 because offset
+              // is 1.
+              expected = expected.map(x => 1 + x);
+              let prefix = 'Connected param: ';
+
+              // The initial part of the output should be silent because the
+              // source node hasn't started yet.
+              should(
+                  actual.slice(0, sourceStartFrame),
+                  prefix + 'ConstantSourceNode frames [0, ' + sourceStartFrame +
+                      ')')
+                  .beConstantValueOf(0);
+              // The rest of the output should be the same as the oscillator (in
+              // channel 1)
+              should(
+                  actual.slice(sourceStartFrame),
+                  prefix + 'ConstantSourceNode frames [' + sourceStartFrame +
+                      ', ' + renderFrames + ')')
+                  .beCloseToArray(expected.slice(sourceStartFrame), 0);
+
+            })
+            .then(() => task.done());
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/conftest.py b/tests/wpt/web-platform-tests/webdriver/tests/conftest.py
index e1491a6802644..b7b8b83c9a3e7 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/conftest.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/conftest.py
@@ -1,8 +1,9 @@
 import pytest
 from tests.support.fixtures import (
-    configuration, create_dialog, create_frame, create_window, http,
-    new_session, server_config, session, url)
+    add_browser_capabilites, configuration, create_dialog, create_frame,
+    create_window, http, new_session, server_config, session, url)
 
+pytest.fixture()(add_browser_capabilites)
 pytest.fixture(scope="session")(configuration)
 pytest.fixture()(create_dialog)
 pytest.fixture()(create_frame)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/contexts/maximize_window.py b/tests/wpt/web-platform-tests/webdriver/tests/contexts/maximize_window.py
index 4173b170881ec..e9257e6fe0aff 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/contexts/maximize_window.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/contexts/maximize_window.py
@@ -39,7 +39,7 @@ def test_handle_prompt_ignore():
     """TODO"""
 
 
-def test_handle_prompt_accept(new_session):
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
     """
     3. Handle any user prompts and return its value if it is an error.
 
@@ -59,7 +59,7 @@ def test_handle_prompt_accept(new_session):
            Accept the current user prompt.
 
     """
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<title>WD doc title</title>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/cookies/delete_cookie.py b/tests/wpt/web-platform-tests/webdriver/tests/cookies/delete_cookie.py
index adb9674909c9e..677fd94e8ba27 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/cookies/delete_cookie.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/cookies/delete_cookie.py
@@ -34,7 +34,7 @@ def test_handle_prompt_ignore():
     """TODO"""
 
 
-def test_handle_prompt_accept(new_session):
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
     """
     2. Handle any user prompts and return its value if it is an error.
 
@@ -54,7 +54,7 @@ def test_handle_prompt_accept(new_session):
            Accept the current user prompt.
 
     """
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<title>WD doc title</title>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/get_active_element.py b/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/get_active_element.py
index 8286633e89de0..900e3fdfa2ca4 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/get_active_element.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/get_active_element.py
@@ -43,8 +43,8 @@ def test_closed_context(session, create_window):
 #    [...]
 #
 # 3. Return success.
-def test_handle_prompt_dismiss(new_session):
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "dismiss"}})
+def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
     session.url = inline("<body><p>Hello, World!</p></body>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
@@ -87,8 +87,8 @@ def test_handle_prompt_dismiss(new_session):
 #    [...]
 #
 # 3. Return success.
-def test_handle_prompt_accept(new_session):
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<body><p>Hello, World!</p></body>")
     create_dialog(session)("alert", text="accept #1", result_var="accept1")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window.py b/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window.py
index 696c579c2665f..9b42ad3442726 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window.py
@@ -43,7 +43,7 @@ def test_handle_prompt_ignore():
     """TODO"""
 
 
-def test_handle_prompt_accept(new_session):
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
     """
     2. Handle any user prompts and return its value if it is an error.
 
@@ -63,7 +63,7 @@ def test_handle_prompt_accept(new_session):
            Accept the current user prompt.
 
     """
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<title>WD doc title</title>")
     create_dialog(session)("alert", text="accept #1", result_var="accept1")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect.py b/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect.py
index 3ec8ce71d47d3..b25ca28692f2c 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect.py
@@ -37,7 +37,7 @@ def test_handle_prompt_ignore():
     """TODO"""
 
 
-def test_handle_prompt_accept(new_session):
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
     """
     2. Handle any user prompts and return its value if it is an error.
 
@@ -57,7 +57,7 @@ def test_handle_prompt_accept(new_session):
            Accept the current user prompt.
 
     """
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<title>WD doc title</title>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/interaction/send_keys_content_editable.py b/tests/wpt/web-platform-tests/webdriver/tests/interaction/send_keys_content_editable.py
index a4bba8e534fda..16ebc2d018fb7 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/interaction/send_keys_content_editable.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/interaction/send_keys_content_editable.py
@@ -11,7 +11,7 @@ def test_sets_insertion_point_to_end(session):
     assert "Hello, world!" == text.strip()
 
 
-# 12. Let current text length be the element’s length.
+# 12. Let current text length be the element's length.
 #
 # 13. Set the text insertion caret using set selection range using current
 #     text length for both the start and end parameters.
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/minimize_window.py b/tests/wpt/web-platform-tests/webdriver/tests/minimize_window.py
index 497d967d98238..5c0ef72bf8460 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/minimize_window.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/minimize_window.py
@@ -37,7 +37,7 @@ def test_handle_prompt_ignore():
     """TODO"""
 
 
-def test_handle_prompt_accept(new_session):
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
     """
     2. Handle any user prompts and return its value if it is an error.
 
@@ -57,7 +57,7 @@ def test_handle_prompt_accept(new_session):
            Accept the current user prompt.
 
     """
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<title>WD doc title</title>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/navigation/get_title.py b/tests/wpt/web-platform-tests/webdriver/tests/navigation/get_title.py
index e0f39acebad0a..7416136fadf0d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/navigation/get_title.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/navigation/get_title.py
@@ -33,8 +33,8 @@ def test_title_from_closed_context(session, create_window):
 #    [...]
 #
 # 3. Return success.
-def test_title_handle_prompt_dismiss(new_session):
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "dismiss"}})
+def test_title_handle_prompt_dismiss(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
     session.url = inline("<title>WD doc title</title>")
 
     expected_title = read_global(session, "document.title")
@@ -80,8 +80,8 @@ def test_title_handle_prompt_dismiss(new_session):
 #    [...]
 #
 # 3. Return success.
-def test_title_handle_prompt_accept(new_session):
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+def test_title_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<title>WD doc title</title>")
     create_dialog(session)("alert", text="accept #1", result_var="accept1")
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_alwaysMatch.py b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_alwaysMatch.py
index 4a91c60d3609d..23350488ddc02 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_alwaysMatch.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_alwaysMatch.py
@@ -4,10 +4,10 @@
 
 from conftest import product, flatten
 
-from .support.create import valid_data
+from support.create import valid_data
 
 
 @pytest.mark.parametrize("key,value", flatten(product(*item) for item in valid_data))
-def test_valid(new_session, key, value):
-    resp = new_session({"capabilities": {"alwaysMatch": {key: value}}})
+def test_valid(new_session, add_browser_capabilites, key, value):
+    resp = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({key: value})}})
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_firstMatch.py b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_firstMatch.py
index ab983e769a4e7..58203e5fc3a5c 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_firstMatch.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_firstMatch.py
@@ -4,9 +4,9 @@
 
 from conftest import product, flatten
 
-from .support.create import valid_data
+from support.create import valid_data
 
 
 @pytest.mark.parametrize("key,value", flatten(product(*item) for item in valid_data))
-def test_valid(new_session, key, value):
-    resp = new_session({"capabilities": {"firstMatch": [{key: value}]}})
+def test_valid(new_session, add_browser_capabilites, key, value):
+    resp = new_session({"capabilities": {"firstMatch": [add_browser_capabilites({key: value})]}})
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/default_values.py b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/default_values.py
index bfe4144f5a303..0dbc798b90796 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/default_values.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/default_values.py
@@ -7,15 +7,15 @@
 from webdriver import error
 
 
-def test_basic(new_session):
-    resp, _ = new_session({"capabilities": {}})
+def test_basic(new_session, add_browser_capabilites):
+    resp, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
     assert set(resp.keys()) == {"sessionId", "capabilities"}
 
 
-def test_repeat_new_session(new_session):
-    resp, _ = new_session({"capabilities": {}})
+def test_repeat_new_session(new_session, add_browser_capabilites):
+    resp, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
     with pytest.raises(error.SessionNotCreatedException):
-        new_session({"capabilities": {}})
+        new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
 
 
 def test_no_capabilites(new_session):
@@ -23,26 +23,26 @@ def test_no_capabilites(new_session):
         new_session({})
 
 
-def test_missing_first_match(new_session):
-    resp, _ = new_session({"capabilities": {"alwaysMatch": {}}})
+def test_missing_first_match(new_session, add_browser_capabilites):
+    resp, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
 
 
-def test_missing_always_match(new_session):
-    resp, _ = new_session({"capabilities": {"firstMatch": [{}]}})
+def test_missing_always_match(new_session, add_browser_capabilites):
+    resp, _ = new_session({"capabilities": {"firstMatch": [add_browser_capabilites({})]}})
 
 
-def test_desired(new_session):
+def test_desired(new_session, add_browser_capabilites):
     with pytest.raises(error.InvalidArgumentException):
-        resp, _ = new_session({"desiredCapbilities": {}})
+        resp, _ = new_session({"desiredCapbilities": add_browser_capabilites({})})
 
 
-def test_ignore_non_spec_fields_in_capabilities(new_session):
-    resp, _ = new_session({"capabilities": {"desiredCapbilities": {"pageLoadStrategy": "eager"}}})
+def test_ignore_non_spec_fields_in_capabilities(new_session, add_browser_capabilites):
+    resp, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({}), "desiredCapbilities": {"pageLoadStrategy": "eager"}}})
     assert resp["capabilities"]["pageLoadStrategy"] == "normal"
 
 
-def test_valid_but_unmatchable_key(new_session):
+def test_valid_but_unmatchable_key(new_session, add_browser_capabilites):
     resp, _ = new_session({"capabilities": {
-      "firstMatch": [{"pageLoadStrategy": "eager", "foo:unmatchable": True},
+      "firstMatch": [add_browser_capabilites({"pageLoadStrategy": "eager", "foo:unmatchable": True}),
                      {"pageLoadStrategy": "none"}]}})
     assert resp["capabilities"]["pageLoadStrategy"] == "none"
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/invalid_capabilities.py b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/invalid_capabilities.py
index 325c9b281af9d..88da4f110cf2d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/invalid_capabilities.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/invalid_capabilities.py
@@ -13,15 +13,15 @@ def test_invalid_capabilites(new_session, value):
 
 
 @pytest.mark.parametrize("value", [None, 1, "{}", []])
-def test_invalid_always_match(new_session, value):
+def test_invalid_always_match(new_session, add_browser_capabilites, value):
     with pytest.raises(error.InvalidArgumentException):
-        new_session({"capabilities": {"alwaysMatch": value}})
+        new_session({"capabilities": {"alwaysMatch": value, "firstMatch": [add_browser_capabilites({})]}})
 
 
 @pytest.mark.parametrize("value", [None, 1, "[]", {}])
-def test_invalid_first_match(new_session, value):
+def test_invalid_first_match(new_session, add_browser_capabilites, value):
     with pytest.raises(error.InvalidArgumentException):
-        new_session({"capabilities": {"firstMatch": value}})
+        new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({}), "firstMatch": value}})
 
 
 invalid_data = [
@@ -49,9 +49,14 @@ def test_invalid_first_match(new_session, value):
 @pytest.mark.parametrize("body", [lambda key, value: {"alwaysMatch": {key: value}},
                                   lambda key, value: {"firstMatch": [{key: value}]}])
 @pytest.mark.parametrize("key,value", flatten(product(*item) for item in invalid_data))
-def test_invalid(new_session, body, key, value):
+def test_invalid_values(new_session, add_browser_capabilites, body, key, value):
+    capabilities = body(key, value)
+    if "alwaysMatch" in capabilities:
+        capabilities["alwaysMatch"] = add_browser_capabilites(capabilities["alwaysMatch"])
+    else:
+        capabilities["firstMatch"][0] = add_browser_capabilites(capabilities["firstMatch"][0])
     with pytest.raises(error.InvalidArgumentException):
-        resp = new_session({"capabilities": body(key, value)})
+        resp = new_session({"capabilities": capabilities})
 
 
 invalid_extensions = [
@@ -82,7 +87,12 @@ def test_invalid(new_session, body, key, value):
 @pytest.mark.parametrize("body", [lambda key, value: {"alwaysMatch": {key: value}},
                                   lambda key, value: {"firstMatch": [{key: value}]}])
 @pytest.mark.parametrize("key", invalid_extensions)
-def test_invalid(new_session, body, key):
+def test_invalid_extensions(new_session, add_browser_capabilites, body, key):
+    capabilities = body(key, {})
+    if "alwaysMatch" in capabilities:
+        capabilities["alwaysMatch"] = add_browser_capabilites(capabilities["alwaysMatch"])
+    else:
+        capabilities["firstMatch"][0] = add_browser_capabilites(capabilities["firstMatch"][0])
     with pytest.raises(error.InvalidArgumentException):
-        resp = new_session({"capabilities": body(key, {})})
+        resp = new_session({"capabilities": capabilities})
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/merge.py b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/merge.py
index 2e64620455c16..480fbcdcbdbce 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/merge.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/merge.py
@@ -9,8 +9,13 @@
 @pytest.mark.skipif(platform_name() is None, reason="Unsupported platform")
 @pytest.mark.parametrize("body", [lambda key, value: {"alwaysMatch": {key: value}},
                                   lambda key, value: {"firstMatch": [{key: value}]}])
-def test_platform_name(new_session, platform_name, body):
-    resp, _ = new_session({"capabilities": body("platformName", platform_name)})
+def test_platform_name(new_session, add_browser_capabilites, platform_name, body):
+    capabilities = body("platformName", platform_name)
+    if "alwaysMatch" in capabilities:
+        capabilities["alwaysMatch"] = add_browser_capabilites(capabilities["alwaysMatch"])
+    else:
+        capabilities["firstMatch"][0] = add_browser_capabilites(capabilities["firstMatch"][0])
+    resp, _ = new_session({"capabilities": capabilities})
     assert resp["capabilities"]["platformName"] == platform_name
 
 
@@ -24,17 +29,17 @@ def test_platform_name(new_session, platform_name, body):
 
 
 @pytest.mark.parametrize("key,value", invalid_merge)
-def test_merge_invalid(new_session, key, value):
+def test_merge_invalid(new_session, add_browser_capabilites, key, value):
     with pytest.raises(error.InvalidArgumentException):
          new_session({"capabilities":
-                      {"alwaysMatch": {key: value[0]},
+                      {"alwaysMatch": add_browser_capabilites({key: value[0]}),
                        "firstMatch": [{}, {key: value[1]}]}})
 
 
 @pytest.mark.skipif(platform_name() is None, reason="Unsupported platform")
-def test_merge_platformName(new_session, platform_name):
+def test_merge_platformName(new_session, add_browser_capabilites, platform_name):
     resp, _ = new_session({"capabilities":
-                        {"alwaysMatch": {"timeouts": {"script": 10}}},
+                        {"alwaysMatch": add_browser_capabilites({"timeouts": {"script": 10}}),
                         "firstMatch": [
                             {
                                 "platformName": platform_name.upper(),
@@ -44,14 +49,14 @@ def test_merge_platformName(new_session, platform_name):
                                 "platformName": platform_name,
                                 "pageLoadStrategy": "eager"
                             }
-                        ]})
+                        ]}})
 
     assert resp["capabilities"]["platformName"] == platform_name
     assert resp["capabilities"]["pageLoadStrategy"] == "eager"
 
 
-def test_merge_browserName(new_session):
-    resp, session = new_session({})
+def test_merge_browserName(new_session, add_browser_capabilites):
+    resp, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
     browser_settings = {
         "browserName": resp["capabilities"]["browserName"],
         "browserVersion": resp["capabilities"]["browserVersion"],
@@ -60,7 +65,7 @@ def test_merge_browserName(new_session):
     session.end()
 
     resp, _ = new_session({"capabilities":
-                        {"alwaysMatch": {"timeouts": {"script": 10}}},
+                        {"alwaysMatch": add_browser_capabilites({"timeouts": {"script": 10}}),
                         "firstMatch": [
                             {
                                 "browserName": browser_settings["browserName"] + "invalid",
@@ -70,7 +75,7 @@ def test_merge_browserName(new_session):
                                 "browserName": browser_settings["browserName"],
                                 "pageLoadStrategy": "eager"
                             }
-                        ]})
+                        ]}})
 
     assert resp["capabilities"]["browserName"] == browser_settings['browserName']
     assert resp["capabilities"]["pageLoadStrategy"] == "eager"
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/response.py b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/response.py
index 6669573ba2cf6..0bec23f9990d7 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/response.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/response.py
@@ -2,14 +2,14 @@
 
 import uuid
 
-def test_resp_sessionid(new_session):
-    resp, _ = new_session({"capabilities": {}})
+def test_resp_sessionid(new_session, add_browser_capabilites):
+    resp, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
     assert isinstance(resp["sessionId"], unicode)
     uuid.UUID(hex=resp["sessionId"])
 
 
-def test_resp_capabilites(new_session):
-    resp, _ = new_session({"capabilities": {}})
+def test_resp_capabilites(new_session, add_browser_capabilites):
+    resp, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
     assert isinstance(resp["sessionId"], unicode)
     assert isinstance(resp["capabilities"], dict)
     assert {"browserName",
@@ -23,8 +23,8 @@ def test_resp_capabilites(new_session):
                 set(resp["capabilities"].keys()))
 
 
-def test_resp_data(new_session, platform_name):
-    resp, _ = new_session({"capabilities": {}})
+def test_resp_data(new_session, add_browser_capabilites, platform_name):
+    resp, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
 
     assert isinstance(resp["capabilities"]["browserName"], unicode)
     assert isinstance(resp["capabilities"]["browserVersion"], unicode)
@@ -41,14 +41,14 @@ def test_resp_data(new_session, platform_name):
     assert resp["capabilities"]["pageLoadStrategy"] == "normal"
 
 
-def test_timeouts(new_session, platform_name):
-    resp, _ = new_session({"capabilities": {"alwaysMatch": {"timeouts": {"implicit": 1000}}}})
+def test_timeouts(new_session, add_browser_capabilites, platform_name):
+    resp, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"timeouts": {"implicit": 1000}})}})
     assert resp["capabilities"]["timeouts"] == {
         "implicit": 1000,
         "pageLoad": 300000,
         "script": 30000
     }
 
-def test_pageLoadStrategy(new_session, platform_name):
-    resp, _ = new_session({"capabilities": {"alwaysMatch": {"pageLoadStrategy": "eager"}}})
+def test_pageLoadStrategy(new_session, add_browser_capabilites, platform_name):
+    resp, _ = new_session({"capabilities": add_browser_capabilites({"alwaysMatch": {"pageLoadStrategy": "eager"}})})
     assert resp["capabilities"]["pageLoadStrategy"] == "eager"
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/__init__.py
new file mode 100644
index 0000000000000..d3f5a12faa997
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/__init__.py
@@ -0,0 +1 @@
+
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect.py b/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect.py
index b300d09d111cf..f945f19a26dd9 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect.py
@@ -33,7 +33,7 @@ def test_handle_prompt_dismiss():
     """TODO"""
 
 
-def test_handle_prompt_accept(new_session):
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
     """
     2. Handle any user prompts and return its value if it is an error.
 
@@ -53,8 +53,7 @@ def test_handle_prompt_accept(new_session):
            Accept the current user prompt.
 
     """
-    _, session = new_session(
-        {"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     original = session.window.rect
 
     # step 2
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_attribute.py b/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_attribute.py
index e662d95a9c78a..d08eda1c2445a 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_attribute.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_attribute.py
@@ -24,9 +24,9 @@ def test_no_browsing_context(session, create_window):
     assert_error(result, "no such window")
 
 
-def test_handle_prompt_dismiss(new_session):
+def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
     # 13.2 step 2
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "dismiss"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
     session.url = inline("<input id=foo>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
@@ -51,9 +51,9 @@ def test_handle_prompt_dismiss(new_session):
     assert_dialog_handled(session, "dismiss #3")
 
 
-def test_handle_prompt_accept(new_session):
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
     # 13.2 step 2
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<input id=foo>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_property.py b/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_property.py
index 00a85af69b522..d84339db6e6b5 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_property.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_property.py
@@ -19,9 +19,9 @@ def test_no_browsing_context(session, create_window):
     assert_error(result, "no such window")
 
 
-def test_handle_prompt_dismiss(new_session):
+def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
     # 13.3 step 2
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "dismiss"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
     session.url = inline("<input id=foo>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
@@ -53,9 +53,9 @@ def test_handle_prompt_dismiss(new_session):
 
 
 
-def test_handle_prompt_accept(new_session):
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
     # 13.3 step 2
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<input id=foo>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_tag_name.py b/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_tag_name.py
index 4100e9b1e1775..df519f4df5598 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_tag_name.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_tag_name.py
@@ -17,9 +17,9 @@ def test_no_browsing_context(session, create_window):
     assert_error(result, "no such window")
 
 
-def test_handle_prompt_dismiss(new_session):
+def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
     # 13.6 step 2
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "dismiss"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
     session.url = inline("<input id=foo>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
@@ -50,9 +50,9 @@ def test_handle_prompt_dismiss(new_session):
     assert_dialog_handled(session, "dismiss #3")
 
 
-def test_handle_prompt_accept(new_session):
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
     # 13.6 step 2
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<input id=foo>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/is_element_selected.py b/tests/wpt/web-platform-tests/webdriver/tests/state/is_element_selected.py
index c82f26fa912a3..8027d5e03cbca 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/state/is_element_selected.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/state/is_element_selected.py
@@ -26,9 +26,9 @@ def test_no_browsing_context(session, create_window):
     assert_error(result, "no such window")
 
 
-def test_handle_prompt_dismiss(new_session):
+def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
     # 13.1 step 2
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "dismiss"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
     session.url = inline("<input id=foo>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
@@ -59,9 +59,9 @@ def test_handle_prompt_dismiss(new_session):
     assert_dialog_handled(session, "dismiss #3")
 
 
-def test_handle_prompt_accept(new_session):
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
     # 13.1 step 2
-    _, session = new_session({"alwaysMatch": {"unhandledPromptBehavior": "accept"}})
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<input id=foo>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
index d93f862578a20..778acd314c65a 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
@@ -188,8 +188,6 @@ def create_session(body):
         _session = webdriver.Session(configuration["host"],
                                      configuration["port"],
                                      capabilities=None)
-        # TODO: merge in some capabilities from the confguration capabilities
-        # since these might be needed to start the browser
         value = _session.send_command("POST", "session", body=body)
         # Don't set the global session until we are sure this succeeded
         _current_session = _session
@@ -203,6 +201,16 @@ def create_session(body):
     return create_session
 
 
+def add_browser_capabilites(configuration):
+    def update_capabilities(capabilities):
+        # Make sure there aren't keys in common.
+        assert not set(configuration["capabilities"]).intersection(set(capabilities))
+        result = dict(configuration["capabilities"])
+        result.update(capabilities)
+        return result
+    return update_capabilities
+
+
 def url(server_config):
     def inner(path, protocol="http", query="", fragment=""):
         port = server_config["ports"][protocol][0]
diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_Blob.htm b/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_Blob.htm
new file mode 100644
index 0000000000000..a86dc7e55be10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_Blob.htm
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title> postMessage() with a Blob </title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id=log></div>
+<script>
+    var TARGET = null;
+    var SOURCE = null;
+    var description = "Messages can contain Blobs.";
+
+    var t = async_test("Test Description: " + description);
+
+    var channel = new MessageChannel();
+    SOURCE = channel.port1;
+    TARGET = channel.port2;
+    TARGET.start();
+    TARGET.addEventListener("message", t.step_func(TestMessageEvent), true);
+
+    (function() {
+      SOURCE.postMessage({blob: new Blob(['foo', 'bar'])});
+    })();
+    // TODO(https://github.com/w3c/web-platform-tests/issues/7899): Change to
+    // some sort of cross-browser GC trigger.
+    if (self.gc) self.gc();
+
+    function TestMessageEvent(evt)
+    {
+        assert_true('blob' in evt.data);
+        assert_true(evt.data.blob instanceof Blob);
+        assert_equals(evt.data.blob.size, 6);
+        const reader = new FileReader();
+        reader.onerror = t.unreached_func('Reading blob failed');
+        reader.onload = t.step_func(() => {
+            assert_equals(reader.result, 'foobar');
+            t.done();
+          });
+        reader.readAsText(evt.data.blob);
+    }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/blobs.html b/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/blobs.html
index 8b50153fdb805..083204b3eb709 100644
--- a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/blobs.html
+++ b/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/blobs.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-
 async_test(t => {
     const c1 = new BroadcastChannel('blob');
     const c2 = new BroadcastChannel('blob');
@@ -25,7 +24,12 @@
         reader.readAsText(e.data.blob);
       });
     c3.onmessage = c2.onmessage;
-    c1.postMessage({blob: new Blob(['foo', 'bar'])});
+    (() => {
+      c1.postMessage({blob: new Blob(['foo', 'bar'])});
+    })();
+    // TODO(https://github.com/w3c/web-platform-tests/issues/7899): Change to
+    // some sort of cross-browser GC trigger.
+    if (self.gc) self.gc();
   }, 'Blobs work on BroadcastChannel');
 
 async_test(t => {
diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/worker.js b/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/worker.js
index 2f0e4eaa34c8a..640c405cc1069 100644
--- a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/worker.js
+++ b/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/worker.js
@@ -6,7 +6,12 @@ function handler(e, reply) {
     return;
   }
   if (e.data.blob) {
-    c.postMessage({blob: new Blob(e.data.blob)});
+    (() => {
+      c.postMessage({blob: new Blob(e.data.blob)});
+    })();
+    // TODO(https://github.com/w3c/web-platform-tests/issues/7899): Change to
+    // some sort of cross-browser GC trigger.
+    if (self.gc) self.gc();
   }
   c = new BroadcastChannel(e.data.channel);
   let messages = [];
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
index 5f1813f9b522a..8ccebbd867f05 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
@@ -394,3 +394,54 @@ function getTrackFromUserMedia(kind) {
     return [track, mediaStream];
   });
 }
+
+// Obtain |count| MediaStreamTracks of type |kind| and MediaStreams. The tracks
+// do not belong to any stream and the streams are empty. Returns a Promise
+// resolved with a pair of arrays [tracks, streams].
+// Assumes there is at least one available device to generate the tracks and
+// streams and that the getUserMedia() calls resolve.
+function getUserMediaTracksAndStreams(count, type = 'audio') {
+  let otherTracksPromise;
+  if (count > 1)
+    otherTracksPromise = getUserMediaTracksAndStreams(count - 1, type);
+  else
+    otherTracksPromise = Promise.resolve([[], []]);
+  return otherTracksPromise.then(([tracks, streams]) => {
+    return getTrackFromUserMedia(type)
+    .then(([track, stream]) => {
+      // Remove the default stream-track relationship.
+      stream.removeTrack(track);
+      tracks.push(track);
+      streams.push(stream);
+      return [tracks, streams];
+    });
+  });
+}
+
+// Creates an offer for the caller, set it as the caller's local description and
+// then sets the callee's remote description to the offer. Returns the Promise
+// of the setRemoteDescription call.
+function performOffer(caller, callee) {
+  let sessionDescription;
+  return caller.createOffer()
+  .then(offer => {
+    sessionDescription = offer;
+    return caller.setLocalDescription(offer);
+  }).then(() => callee.setRemoteDescription(sessionDescription));
+}
+
+
+// The resolver has a |promise| that can be resolved or rejected using |resolve|
+// or |reject|.
+class Resolver {
+  constructor() {
+    let promiseResolve;
+    let promiseReject;
+    this.promise = new Promise(function(resolve, reject) {
+      promiseResolve = resolve;
+      promiseReject = reject;
+    });
+    this.resolve = promiseResolve;
+    this.reject = promiseReject;
+  }
+}
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-offer.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-offer.html
index 133199a55c52b..449925cb1db29 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-offer.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-offer.html
@@ -11,7 +11,6 @@
   // https://w3c.github.io/webrtc-pc/archives/20170605/webrtc.html
 
   // The following helper functions are called from RTCPeerConnection-helper.js:
-  //   generateOffer()
   //   assert_session_desc_equals()
   //   test_state_change_event()
 
@@ -50,41 +49,78 @@
         - If description is of type "offer", set connection.pendingRemoteDescription
           attribute to description and signaling state to have-remote-offer.
    */
+
   promise_test(t => {
-    const pc = new RTCPeerConnection();
+    const pc1 = new RTCPeerConnection();
+    pc1.createDataChannel('datachannel');
+
+    const pc2 = new RTCPeerConnection();
 
-    test_state_change_event(t, pc, ['have-remote-offer']);
+    test_state_change_event(t, pc2, ['have-remote-offer']);
 
-    return generateOffer({ pc, data: true })
-    .then(offer =>
-      pc.setRemoteDescription(offer)
+    return pc1.createOffer()
+     .then(offer => {
+      return pc2.setRemoteDescription(offer)
       .then(() => {
-        assert_equals(pc.signalingState, 'have-remote-offer');
-        assert_session_desc_equals(pc.remoteDescription, offer);
-        assert_session_desc_equals(pc.pendingRemoteDescription, offer);
-        assert_equals(pc.currentRemoteDescription, null);
-      }));
-  }, 'setRemoteDescription with valid offer should succeed');
+        assert_equals(pc2.signalingState, 'have-remote-offer');
+        assert_session_desc_equals(pc2.remoteDescription, offer);
+        assert_session_desc_equals(pc2.pendingRemoteDescription, offer);
+        assert_equals(pc2.currentRemoteDescription, null);
+      });
+    });
+   }, 'setRemoteDescription with valid offer should succeed');
 
   promise_test(t => {
-    const pc = new RTCPeerConnection();
+    const pc1 = new RTCPeerConnection();
+    pc1.createDataChannel('datachannel');
+
+    const pc2 = new RTCPeerConnection();
 
     // have-remote-offer event should only fire once
-    test_state_change_event(t, pc, ['have-remote-offer']);
-
-    return Promise.all([
-      pc.createOffer({ offerToReceiveAudio: true }),
-      generateOffer({ pc, data: true })
-    ]).then(([offer1, offer2]) =>
-      pc.setRemoteDescription(offer1)
-      .then(() => pc.setRemoteDescription(offer2))
+    test_state_change_event(t, pc2, ['have-remote-offer']);
+
+    return pc1.createOffer()
+    .then(offer => {
+      return pc2.setRemoteDescription(offer)
+      .then(() => pc2.setRemoteDescription(offer))
       .then(() => {
-        assert_equals(pc.signalingState, 'have-remote-offer');
-        assert_session_desc_equals(pc.remoteDescription, offer2);
-        assert_session_desc_equals(pc.pendingRemoteDescription, offer2);
-        assert_equals(pc.currentRemoteDescription, null);
-      }));
-  }, 'Setting remote description multiple times with different offer should succeed');
+        assert_equals(pc2.signalingState, 'have-remote-offer');
+        assert_session_desc_equals(pc2.remoteDescription, offer);
+        assert_session_desc_equals(pc2.pendingRemoteDescription, offer);
+        assert_equals(pc2.currentRemoteDescription, null);
+      });
+    });
+  }, 'setRemoteDescription multiple times should succeed');
+
+  promise_test(t => {
+    const pc1 = new RTCPeerConnection();
+    pc1.createDataChannel('datachannel');
+
+    const pc2 = new RTCPeerConnection();
+
+    // have-remote-offer event should only fire once
+    test_state_change_event(t, pc2, ['have-remote-offer']);
+
+    return pc1.createOffer()
+    .then(offer1 => {
+      return pc1.setLocalDescription(offer1)
+       .then(()=> {
+        return pc1.createOffer({ offerToReceiveAudio: true })
+        .then(offer2 => {
+          assert_session_desc_not_equals(offer1, offer2);
+
+          return pc2.setRemoteDescription(offer1)
+          .then(() => pc2.setRemoteDescription(offer2))
+          .then(() => {
+            assert_equals(pc2.signalingState, 'have-remote-offer');
+            assert_session_desc_equals(pc2.remoteDescription, offer2);
+            assert_session_desc_equals(pc2.pendingRemoteDescription, offer2);
+            assert_equals(pc2.currentRemoteDescription, null);
+          });
+        });
+      });
+    });
+  }, 'setRemoteDescription multiple times with different offer should succeed');
 
   /*
     4.3.1.6.  Set the RTCSessionSessionDescription
@@ -123,13 +159,14 @@
    */
   promise_test(t => {
     const pc = new RTCPeerConnection();
-
     return pc.createOffer()
-    .then(offer => pc.setLocalDescription(offer))
-    .then(() => pc.createOffer())
-    .then(offer2 =>
-      promise_rejects(t, 'InvalidStateError',
-        pc.setRemoteDescription(offer2)));
-  }, 'Calling setRemoteDescription(offer) from have-local-offer state should reject with InvalidStateError');
+    .then(offer => {
+      return pc.setLocalDescription(offer)
+      .then(() => {
+        return promise_rejects(t, 'InvalidStateError',
+          pc.setRemoteDescription(offer));
+      });
+    });
+  }, 'setRemoteDescription(offer) from have-local-offer state should reject with InvalidStateError');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html
new file mode 100644
index 0000000000000..f567c30a7b8d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html
@@ -0,0 +1,222 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>RTCPeerConnection.prototype.setRemoteDescription - add/remove remote tracks</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="RTCPeerConnection-helper.js"></script>
+<script>
+  'use strict';
+
+  // Test is based on the following editor draft:
+  // https://w3c.github.io/webrtc-pc/archives/20171002/webrtc.html
+
+  // The following helper functions are called from RTCPeerConnection-helper.js:
+  //   getUserMediaTracksAndStreams
+  //   performOffer
+  //   Resolver
+
+  // These tests are concerned with the observable consequences of processing
+  // the addition or removal of remote tracks, including events firing and the
+  // states of RTCPeerConnection, MediaStream and MediaStreamTrack.
+
+  async_test(t => {
+    const caller = new RTCPeerConnection();
+    const callee = new RTCPeerConnection();
+    return getUserMediaTracksAndStreams(1)
+    .then(t.step_func(([tracks, streams]) => {
+      let localTrack = tracks[0];
+      caller.addTrack(localTrack);
+      let offerPromise = performOffer(caller, callee);
+      callee.ontrack = t.step_func(trackEvent => {
+        let remoteTrack = trackEvent.track;
+        assert_equals(remoteTrack.id, localTrack.id,
+                      'Expected local and remote track IDs to match.');
+        assert_equals(trackEvent.streams.length, 0,
+                      'Expected remote track not to belong to a stream.');
+        t.done();
+      });
+      return offerPromise;
+    }))
+    .catch(t.step_func(reason => {
+      assert_unreached(reason);
+    }));
+  }, 'addTrack with a track and no stream makes ontrack fire with a track and no stream.');
+
+  async_test(t => {
+    const caller = new RTCPeerConnection();
+    const callee = new RTCPeerConnection();
+    return getUserMediaTracksAndStreams(1)
+    .then(t.step_func(([tracks, streams]) => {
+      let localTrack = tracks[0];
+      let localStream = streams[0];
+      caller.addTrack(localTrack, localStream);
+      let offerPromise = performOffer(caller, callee);
+      callee.ontrack = t.step_func(trackEvent => {
+        assert_equals(trackEvent.streams.length, 1,
+                      'Expected track event to fire with a single stream.');
+        let remoteTrack = trackEvent.track;
+        let remoteStream = trackEvent.streams[0];
+        assert_equals(remoteTrack.id, localTrack.id,
+                      'Expected local and remote track IDs to match.');
+        assert_equals(remoteStream.id, localStream.id,
+                      'Expected local and remote stream IDs to match.');
+        assert_array_equals(remoteStream.getTracks(), [remoteTrack],
+                            'Expected the remote stream\'s tracks to be the remote track.');
+        t.done();
+      });
+      return offerPromise;
+    }))
+    .catch(t.step_func(reason => {
+      assert_unreached(reason);
+    }));
+  }, 'addTrack with a track and a stream makes ontrack fire with a track and a stream.');
+
+  async_test(t => {
+    const caller = new RTCPeerConnection();
+    const callee = new RTCPeerConnection();
+    return getUserMediaTracksAndStreams(2)
+    .then(t.step_func(([tracks, streams]) => {
+      let localTrack1 = tracks[0];
+      let localTrack2 = tracks[1];
+      let localStream = streams[0];
+      caller.addTrack(localTrack1, localStream);
+      caller.addTrack(localTrack2, localStream);
+      let offerPromise = performOffer(caller, callee);
+      callee.ontrack = t.step_func(trackEvent => {
+        assert_equals(trackEvent.streams.length, 1,
+                      'Expected track event to fire with a single stream.');
+        let remoteTrack1 = trackEvent.track;
+        let remoteStream = trackEvent.streams[0];
+        assert_equals(remoteTrack1.id, localTrack1.id,
+                      'Expected first remote track ID to match first local track ID.');
+        assert_equals(remoteStream.getTracks().length, 2,
+                      'Expected the remote stream to contain two tracks.');
+        callee.ontrack = t.step_func(trackEvent => {
+          assert_equals(trackEvent.streams.length, 1,
+                        'Expected track event to fire with a single stream.');
+          let remoteTrack2 = trackEvent.track;
+          assert_equals(trackEvent.streams[0], remoteStream,
+                        'Expected both track events to fire with the same remote stream.');
+          assert_equals(remoteTrack2.id, localTrack2.id,
+                        'Expected second remote track ID to match second local track ID.');
+          assert_equals(remoteStream.getTracks().length, 2,
+                        'Expected the remote stream to contain two tracks.');
+          assert_array_equals(remoteStream.getTracks(), [remoteTrack1, remoteTrack2],
+                              'Expected the remote stream\'s tracks to be the [first, second] remote tracks.');
+          t.done();
+        });
+      });
+      return offerPromise;
+    }))
+    .catch(t.step_func(reason => {
+      assert_unreached(reason);
+    }));
+  }, 'addTrack with two tracks and one stream makes ontrack fire twice with the tracks and shared stream.');
+
+  async_test(t => {
+    const caller = new RTCPeerConnection();
+    const callee = new RTCPeerConnection();
+    return getUserMediaTracksAndStreams(2)
+    .then(t.step_func(([tracks, streams]) => {
+      let localTrack = tracks[0];
+      let localStreams = streams;
+      caller.addTrack(localTrack, localStreams[0], localStreams[1]);
+      let performOffer = performOffer(caller, callee);
+      callee.ontrack = t.step_func(trackEvent => {
+        assert_equals(trackEvent.streams.length, 2,
+                      'Expected the track event to fire with two streams.');
+        let remoteTrack = trackEvent.track;
+        let remoteStreams = trackEvent.streams;
+        assert_equals(remoteTrack.id, localTrack.id,
+                      'Expected local and remote track IDs to match.');
+        assert_equals(remoteStreams[0].id, localStreams[0].id,
+                      'Expected the first remote stream ID to match the first local stream ID.');
+        assert_equals(remoteStreams[1].id, localStreams[1].id,
+                      'Expected the second remote stream ID to match the second local stream ID.');
+        assert_array_equals(remoteStreams[0].getTracks(), [remoteTrack],
+                            'Expected the remote stream\'s tracks to be the remote track.');
+        assert_array_equals(remoteStreams[1].getTracks(), [remoteTrack],
+                            'Expected the remote stream\'s tracks to be the remote track.');
+        t.done();
+      });
+      return performOffer;
+    }))
+    .catch(t.step_func(reason => {
+      assert_unreached(reason);
+    }));
+  }, 'addTrack with a track and two streams makes ontrack fire with a track and two streams.');
+
+  async_test(t => {
+    const caller = new RTCPeerConnection();
+    const callee = new RTCPeerConnection();
+    let eventSequence = '';
+    return getUserMediaTracksAndStreams(1)
+    .then(t.step_func(([tracks, streams]) => {
+      caller.addTrack(tracks[0]);
+      let ontrackResolver = new Resolver();
+      callee.ontrack = () => {
+        eventSequence += 'ontrack;';
+        ontrackResolver.resolve();
+      }
+      return Promise.all([
+        ontrackResolver.promise,
+        performOffer(caller, callee).then(() => {
+          eventSequence += 'setRemoteDescription;';
+        })
+      ]);
+    }))
+    .then(t.step_func(() => {
+      assert_equals(eventSequence, 'ontrack;setRemoteDescription;');
+      t.done();
+    }))
+    .catch(t.step_func(reason => {
+      assert_unreached(reason);
+    }));
+  }, 'ontrack fires before setRemoteDescription resolves.');
+
+  async_test(t => {
+    const caller = new RTCPeerConnection();
+    const callee = new RTCPeerConnection();
+    return getUserMediaTracksAndStreams(1)
+    .then(t.step_func(([tracks, streams]) => {
+      caller.addTrack(tracks[0]);
+      let offerPromise = performOffer(caller, callee);
+      callee.ontrack = t.step_func(trackEvent => {
+        assert_array_equals(callee.getReceivers(), [trackEvent.receiver]);
+        t.done();
+      });
+      return offerPromise;
+    }))
+    .catch(t.step_func(reason => {
+      assert_unreached(reason);
+    }));
+  }, 'ontrack\'s receiver matches getReceivers().');
+
+  async_test(t => {
+    const caller = new RTCPeerConnection();
+    const callee = new RTCPeerConnection();
+    return getUserMediaTracksAndStreams(1)
+    .then(t.step_func(([tracks, streams]) => {
+      let sender = caller.addTrack(tracks[0]);
+      assert_true(sender != null);
+      let offerPromise = performOffer(caller, callee);
+      callee.ontrack = t.step_func(trackEvent => {
+        let receivers = callee.getReceivers();
+        assert_equals(receivers.length, 1,
+                      'Expected getReceivers() to be the track event\'s receiver.');
+        caller.removeTrack(sender);
+        performOffer(caller, callee)
+        .then(t.step_func(() => {
+          assert_array_equals(callee.getReceivers(), receivers,
+                              'Expected the set of receivers to remain the same.');
+          t.done();
+        }));
+      });
+      return offerPromise;
+    }))
+    .catch(t.step_func(reason => {
+      assert_unreached(reason);
+    }));
+  }, 'removeTrack does not remove the receiver.');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/webrtc/getstats.html b/tests/wpt/web-platform-tests/webrtc/getstats.html
index 9a10936c85a67..9775f2090f220 100644
--- a/tests/wpt/web-platform-tests/webrtc/getstats.html
+++ b/tests/wpt/web-platform-tests/webrtc/getstats.html
@@ -68,11 +68,14 @@ <h2>Retrieved stats info</h2>
       }
       showStats.innerHTML = JSON.stringify(reportDictionary, null, 2);
       // Check the stats properties.
-      assert_not_equals(report, null);
+      assert_not_equals(report, null, 'No report');
       let sessionStat = getStatsRecordByType(report, 'peer-connection');
       assert_not_equals(sessionStat, null, 'Did not find peer-connection stats');
-      assert_exists(sessionStat, 'dataChannelsOpened');
-      assert_equals(sessionStat.dataChannelsOpened, 1);
+      assert_exists(sessionStat, 'dataChannelsOpened', 'no dataChannelsOpened stat');
+      // Once every 4000 or so tests, the datachannel won't be opened when the getStats
+      // function is done, so allow both 0 and 1 datachannels.
+      assert_true(sessionStat.dataChannelsOpened == 1 || sessionStat.dataChannelsOpened == 0,
+                  'dataChannelsOpened count wrong');
       test.done();
     })
     .catch(test.step_func(function(e) {
@@ -93,7 +96,6 @@ <h2>Retrieved stats info</h2>
     // The createDataChannel is necessary and sufficient to make
     // sure the ICE connection be attempted.
     gFirstConnection.createDataChannel('channel');
-
     var atStep = 'Create offer';
 
     gFirstConnection.createOffer()
diff --git a/tests/wpt/web-platform-tests/webrtc/interfaces.html b/tests/wpt/web-platform-tests/webrtc/interfaces.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/webrtc/interfaces.html
rename to tests/wpt/web-platform-tests/webrtc/interfaces.https.html
diff --git a/tests/wpt/web-platform-tests/websockets/README.md b/tests/wpt/web-platform-tests/websockets/README.md
index 0e5ffd685dcd7..b4f173a036104 100644
--- a/tests/wpt/web-platform-tests/websockets/README.md
+++ b/tests/wpt/web-platform-tests/websockets/README.md
@@ -1,2 +1,2 @@
 These are the `WebSocket` tests for the
-[Web sockets chapter of the HTML Standard](https://html.spec.whatwg.org/multipage/comms.html#network).
+[Web sockets chapter of the HTML Standard](https://html.spec.whatwg.org/multipage/web-sockets.html#network).
diff --git a/tests/wpt/web-platform-tests/worklets/animation-worklet-import.html b/tests/wpt/web-platform-tests/worklets/animation-worklet-import.html
index 3457d44504680..98b56d36250f2 100644
--- a/tests/wpt/web-platform-tests/worklets/animation-worklet-import.html
+++ b/tests/wpt/web-platform-tests/worklets/animation-worklet-import.html
@@ -4,11 +4,12 @@
     <script src="/common/get-host-info.sub.js"></script>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/worklet-test-utils.js"></script>
     <script src="resources/import-tests.js"></script>
 </head>
 <body>
 <script>
-    runImportTests(window.animationWorklet);
+    runImportTests("animation");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/worklets/animation-worklet-referrer.html b/tests/wpt/web-platform-tests/worklets/animation-worklet-referrer.html
new file mode 100644
index 0000000000000..494e06a847279
--- /dev/null
+++ b/tests/wpt/web-platform-tests/worklets/animation-worklet-referrer.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script src="/common/get-host-info.sub.js"></script>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/worklet-test-utils.js"></script>
+    <script src="resources/referrer-tests.js"></script>
+</head>
+<body>
+<script>
+    runReferrerTests("animation");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/worklets/paint-worklet-import.html b/tests/wpt/web-platform-tests/worklets/paint-worklet-import.html
index f65e308af85c0..68e926c8c1886 100644
--- a/tests/wpt/web-platform-tests/worklets/paint-worklet-import.html
+++ b/tests/wpt/web-platform-tests/worklets/paint-worklet-import.html
@@ -4,11 +4,12 @@
     <script src="/common/get-host-info.sub.js"></script>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/worklet-test-utils.js"></script>
     <script src="resources/import-tests.js"></script>
 </head>
 <body>
 <script>
-    runImportTests(CSS.paintWorklet);
+    runImportTests("paint");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/worklets/paint-worklet-referrer.html b/tests/wpt/web-platform-tests/worklets/paint-worklet-referrer.html
new file mode 100644
index 0000000000000..a4b5a6f498c27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/worklets/paint-worklet-referrer.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script src="/common/get-host-info.sub.js"></script>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/worklet-test-utils.js"></script>
+    <script src="resources/referrer-tests.js"></script>
+</head>
+<body>
+<script>
+    runReferrerTests("paint");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-tests.js b/tests/wpt/web-platform-tests/worklets/resources/import-tests.js
index d40ed3ef855c2..b2374e761bdb8 100644
--- a/tests/wpt/web-platform-tests/worklets/resources/import-tests.js
+++ b/tests/wpt/web-platform-tests/worklets/resources/import-tests.js
@@ -1,8 +1,10 @@
 // Runs a series of tests related to importing scripts on a worklet.
 //
 // Usage:
-// runImportTests(workletType);
-function runImportTests(worklet) {
+// runImportTests("paint");
+function runImportTests(worklet_type) {
+    const worklet = get_worklet(worklet_type);
+
     promise_test(() => {
         const kScriptURL = 'resources/empty-worklet-script.js';
         return worklet.addModule(kScriptURL).then(undefined_arg => {
diff --git a/tests/wpt/web-platform-tests/worklets/resources/referrer-tests.js b/tests/wpt/web-platform-tests/worklets/resources/referrer-tests.js
new file mode 100644
index 0000000000000..366bb9b5704ce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/worklets/resources/referrer-tests.js
@@ -0,0 +1,96 @@
+function openWindow(url) {
+  return new Promise(resolve => {
+      let win = window.open(url, '_blank');
+      add_completion_callback(() => win.close());
+      window.onmessage = e => {
+        assert_equals(e.data, 'LOADED');
+        resolve(win);
+      };
+    });
+}
+
+// Runs a series of tests related to the referrer policy on a worklet.
+//
+// Usage:
+// runReferrerTests("paint");
+function runReferrerTests(worklet_type) {
+  const worklet = get_worklet(worklet_type);
+
+  promise_test(() => {
+      const kWindowURL = "resources/referrer-window.html" +
+                         "?pipe=header(Referrer-Policy,no-referrer)";
+      return openWindow(kWindowURL).then(win => {
+          const promise = new Promise(resolve => window.onmessage = resolve);
+          win.postMessage({ type: worklet_type,
+                            referrer_policy: 'no-referrer',
+                            is_cross_origin: false }, '*');
+          return promise;
+      }).then(msg_event => assert_equals(msg_event.data, 'RESOLVED'));
+  }, 'Importing a same-origin script from a page that has "no-referrer" ' +
+     'referrer policy should not send referrer.');
+
+  promise_test(() => {
+      const kWindowURL = "resources/referrer-window.html" +
+                         "?pipe=header(Referrer-Policy,no-referrer)";
+      return openWindow(kWindowURL).then(win => {
+          const promise = new Promise(resolve => window.onmessage = resolve);
+          win.postMessage({ type: worklet_type,
+                            referrer_policy: 'no-referrer',
+                            is_cross_origin: true }, '*');
+          return promise;
+      }).then(msg_event => assert_equals(msg_event.data, 'RESOLVED'));
+  }, 'Importing a remote-origin script from a page that has "no-referrer" ' +
+     'referrer policy should not send referrer.');
+
+  promise_test(() => {
+      const kWindowURL = 'resources/referrer-window.html' +
+                         '?pipe=header(Referrer-Policy,origin)';
+      return openWindow(kWindowURL).then(win => {
+          const promise = new Promise(resolve => window.onmessage = resolve);
+          win.postMessage({ type: worklet_type,
+                            referrer_policy: 'origin',
+                            is_cross_origin: false }, '*');
+          return promise;
+      }).then(msg_event => assert_equals(msg_event.data, 'RESOLVED'));
+  }, 'Importing a same-origin script from a page that has "origin" ' +
+     'referrer policy should send only an origin as referrer.');
+
+  promise_test(() => {
+      const kWindowURL = 'resources/referrer-window.html' +
+                         '?pipe=header(Referrer-Policy,origin)';
+      return openWindow(kWindowURL).then(win => {
+          const promise = new Promise(resolve => window.onmessage = resolve);
+          win.postMessage({ type: worklet_type,
+                            referrer_policy: 'origin',
+                            is_cross_origin: true }, '*');
+          return promise;
+      }).then(msg_event => assert_equals(msg_event.data, 'RESOLVED'));
+  }, 'Importing a remote-origin script from a page that has "origin" ' +
+     'referrer policy should send only an origin as referrer.');
+
+  promise_test(() => {
+      const kWindowURL = 'resources/referrer-window.html' +
+                         '?pipe=header(Referrer-Policy,same-origin)';
+      return openWindow(kWindowURL).then(win => {
+          const promise = new Promise(resolve => window.onmessage = resolve);
+          win.postMessage({ type: worklet_type,
+                            referrer_policy: 'same-origin',
+                            is_cross_origin: false }, '*');
+          return promise;
+      }).then(msg_event => assert_equals(msg_event.data, 'RESOLVED'));
+  }, 'Importing a same-origin script from a page that has "same-origin" ' +
+     'referrer policy should send referrer.');
+
+  promise_test(() => {
+      const kWindowURL = 'resources/referrer-window.html' +
+                         '?pipe=header(Referrer-Policy,same-origin)';
+      return openWindow(kWindowURL).then(win => {
+          const promise = new Promise(resolve => window.onmessage = resolve);
+          win.postMessage({ type: worklet_type,
+                            referrer_policy: 'same-origin',
+                            is_cross_origin: true }, '*');
+          return promise;
+      }).then(msg_event => assert_equals(msg_event.data, 'RESOLVED'));
+  }, 'Importing a remote-origin script from a page that has "same-origin" ' +
+     'referrer policy should not send referrer.');
+}
diff --git a/tests/wpt/web-platform-tests/worklets/resources/referrer-window.html b/tests/wpt/web-platform-tests/worklets/resources/referrer-window.html
new file mode 100644
index 0000000000000..406b025ac55e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/worklets/resources/referrer-window.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Worklet: Referrer</title>
+  <script src="/common/get-host-info.sub.js"></script>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="worklet-test-utils.js"></script>
+</head>
+<body>
+<script>
+window.onmessage = e => {
+  const worklet_type = e.data.type;
+  const is_cross_origin = e.data.is_cross_origin;
+
+  const params = new URLSearchParams;
+  params.append('referrer_policy', e.data.referrer_policy)
+  params.append('source_origin', get_host_info().HTTP_ORIGIN);
+
+  let script_url = '';
+  if (is_cross_origin) {
+    params.append('is_cross_origin', 'true')
+    script_url = get_host_info().HTTP_REMOTE_ORIGIN + '/worklets/resources/';
+  }
+  script_url += 'referrer.py?' + params;
+
+  get_worklet(worklet_type).addModule(script_url)
+      .then(() => window.opener.postMessage('RESOLVED', '*'))
+      .catch(e => window.opener.postMessage(e.message, '*'));
+};
+
+window.opener.postMessage('LOADED', '*');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/worklets/resources/referrer.py b/tests/wpt/web-platform-tests/worklets/resources/referrer.py
new file mode 100644
index 0000000000000..62dd4a12ff422
--- /dev/null
+++ b/tests/wpt/web-platform-tests/worklets/resources/referrer.py
@@ -0,0 +1,30 @@
+# Returns a valid response when request's |referrer| matches |referrer_policy|.
+def main(request, response):
+    referrer = request.headers.get("referer", None)
+    referrer_policy = request.GET.first("referrer_policy")
+    source_origin = request.GET.first("source_origin")
+    is_cross_origin = request.GET.first("is_cross_origin", False)
+
+    response_headers = [("Content-Type", "text/javascript"),
+                        ("Access-Control-Allow-Origin", source_origin)];
+
+    # When the referrer policy is "no-referrer", the referrer header shouldn't
+    # be sent.
+    if referrer_policy == "no-referrer" and not referrer:
+        return (200, response_headers, "")
+
+    # When the referrer policy is "origin", the referrer header should contain
+    # only the origin. Note that |referrer| contains a trailing slash, while
+    # |source_origin| doesn't.
+    if referrer_policy == "origin" and referrer == source_origin + "/":
+        return (200, response_headers, "")
+
+    # When the referrer policy is "same-origin", the referrer header should be
+    # sent only for a same-origin request.
+    if referrer_policy == "same-origin":
+        if is_cross_origin and not referrer:
+            return (200, response_headers, "")
+        if not is_cross_origin and referrer:
+            return (200, response_headers, "")
+
+    return (404)
diff --git a/tests/wpt/web-platform-tests/worklets/resources/worklet-test-utils.js b/tests/wpt/web-platform-tests/worklets/resources/worklet-test-utils.js
new file mode 100644
index 0000000000000..4912dadb9d54a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/worklets/resources/worklet-test-utils.js
@@ -0,0 +1,8 @@
+// Returns a reference to a worklet object corresponding to a given type.
+function get_worklet(type) {
+  if (type == 'paint')
+    return CSS.paintWorklet;
+  if (type == 'animation')
+    return window.animationWorklet;
+  return undefined;
+}

From 291d686c6a11dc88a202fd7a07394ef11f852743 Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Mon, 30 Oct 2017 13:01:21 -0400
Subject: [PATCH 2/2] Fix whitespace error in 'empty' file

---
 tests/wpt/metadata/MANIFEST.json                         | 9 ---------
 tests/wpt/mozilla/meta/MANIFEST.json                     | 2 +-
 .../tests/sessions/new_session/support/__init__.py       | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/__init__.py

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index be71e38d09c08..b9e797f6cfda9 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -282299,11 +282299,6 @@
      {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/support/__init__.py": [
-    [
-     {}
-    ]
-   ],
    "webdriver/tests/sessions/new_session/support/create.py": [
     [
      {}
@@ -583790,10 +583785,6 @@
    "973f5deb240dd01f6213252e6d9fc2f462b0e035",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/support/__init__.py": [
-   "ba8ab5a0280b953aa97435ff8946cbcbb2755a27",
-   "support"
-  ],
   "webdriver/tests/sessions/new_session/support/create.py": [
    "440d88462cc418e4d5e1df6f73074d3a722bd2fd",
    "support"
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index f2751e80daab7..d66fbfa5b89ae 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -26648,7 +26648,7 @@
    "support"
   ],
   "css/test_font_family_parsing.html": [
-   "fb9155875cb9cee7eba6e7a9be311ef02c82a869",
+   "cc867061f762b6bdd3bf9a3b4c72f15a25a2505d",
    "testharness"
   ],
   "css/test_variable_legal_values.html": [
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/__init__.py
deleted file mode 100644
index d3f5a12faa997..0000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-