From 43a98198a6d7a65ecb914d261940aaac34d01278 Mon Sep 17 00:00:00 2001
From: Sam Sneddon <gsnedders@apple.com>
Date: Mon, 23 Sep 2024 16:46:25 -0700
Subject: [PATCH] Start running the parsed file lints against support files

This is largely motivated by ensuring that people aren't including
testharnessreport.js in support files which are then included via
fetch_tests_from_window, and most of the files changed here are
removing redundant inclusions here.

We also find a few other errors, such as testdriver-vendor.js being
omitted and invalid values for <meta name=timeout>, which are also
fixed.

Finally, add a few things to the allowlist.
---
 .../resources/protocol_handlers_entry.html    |  1 -
 .../embedded-popup-expect-hints.html          |  1 -
 .../embedded-popup-expect-no-hints.html       |  1 -
 .../resources/support-iframe.html             |  1 -
 .../support/frame-in-frame.sub.html           |  1 -
 .../support/test_csp_self_window.sub.html     |  1 -
 .../partitioned-cookies-cross-site-embed.html |  1 -
 ...artitioned-cookies-top-level-redirect.html |  1 -
 .../third-party-cookies-cross-site-embed.html |  1 -
 .../automatic-beacon-unfenced-page.html       |  1 -
 .../background-fetch-inner.https.html         |  1 -
 .../background-fetch-sw-inner.https.html      |  1 -
 .../background-sync-inner.https.html          |  1 -
 .../background-sync-sw-inner.https.html       |  1 -
 ...child-fenced-frame-onload-event-inner.html |  1 -
 ...cestor-from-nested-fenced-frame.https.html |  1 -
 ...ate-ancestor-from-nested-iframe.https.html |  1 -
 .../navigate-ancestor-test-runner.https.html  |  1 -
 .../permission-geolocation-test-runner.html   |  1 -
 .../window-navigation-204-inner.html          |  1 -
 ...network-partition-about-blank-checker.html |  1 -
 .../resources/network-partition-checker.html  |  1 -
 .../network-partition-iframe-checker.html     |  1 -
 .../network-partition-worker-checker.html     |  1 -
 .../split-cache-popup-with-iframe.html        |  1 -
 .../resources/split-cache-popup.html          |  1 -
 ...s-event-after-switching-iframes-inner.html |  1 +
 .../order-in-prerender-activation-popup.html  |  1 -
 .../observer-in-iframe-subframe.html          |  1 -
 lint.ignore                                   | 33 +++++++++++++++++++
 .../resources/404-with-early-hints.html       |  1 -
 .../arbitrary-header-in-early-hints.html      |  1 -
 .../early-hints/resources/coep-mismatch.html  |  1 -
 loading/early-hints/resources/csp-basic.html  |  1 -
 .../resources/csp-document-disallow.html      |  1 -
 .../modulepreload-in-early-hints.html         |  1 -
 .../multiple-early-hints-responses.html       |  1 -
 .../resources/preconnect-in-early-hints.html  |  1 -
 .../resources/preload-as-test.html            |  1 -
 .../early-hints/resources/preload-fetch.html  |  1 -
 .../resources/preload-fetchpriority.html      |  1 -
 ...reload-finished-before-final-response.html |  1 -
 ...d-while-receiving-final-response-body.html |  1 -
 .../preload-in-flight-when-consumed.html      |  1 -
 .../resources/preload-initiator-type.html     |  1 -
 ...rect-cross-origin-between-early-hints.html |  1 -
 .../resources/redirect-cross-origin.html      |  1 -
 ...irect-same-origin-between-early-hints.html |  1 -
 .../resources/redirect-same-origin.html       |  1 -
 .../resources/referrer-policy-test.html       |  1 -
 ...redirect-with-cookie-header.sub.https.html |  1 -
 .../redirect-chain-start.sub.https.html       |  1 +
 .../resources/going-back.html                 |  1 -
 .../controlling-ua/support/iframe.html        |  1 -
 ...st_onconnectionavailable_receiving-ua.html |  1 -
 ...tationConnection_onclose_receiving-ua.html |  1 -
 ...tionConnection_onmessage_receiving-ua.html |  1 -
 ...sentationReceiver_create_receiving-ua.html |  1 -
 ...ionReceiver_create_receiving-ua_child.html |  1 -
 ...tationReceiver_unreached_receiving-ua.html |  1 -
 .../support/idlharness_receiving-ua.html      |  1 -
 .../resources/frameset-timing-frame.html      |  1 -
 .../resources/samesite-sw-helper.html         |  1 -
 .../resources/claim-with-redirect-iframe.html |  1 -
 .../clients-get-cross-origin-frame.html       |  1 -
 ...selection-operation-limit-inner.https.html |  1 -
 ...et-in-sandboxed-frame-inner.https.sub.html |  1 -
 .../select-url-permissions-policy-helper.html |  1 -
 ...red-storage-permissions-policy-helper.html |  1 -
 .../resources/about-blank-iframes.html        |  1 -
 .../resources/audio-setSinkId.https.html      |  1 -
 .../resources/background-fetch.https.html     |  1 -
 .../resources/background-sync.https.html      |  1 -
 .../resources/battery-status.https.html       |  1 -
 .../resources/bluetooth-access.https.html     |  1 -
 .../resources/broadcast-channel.html          |  1 -
 .../resources/cross-origin-iframe.html        |  1 -
 .../cross-origin-isolated-iframe.https.html   |  1 -
 .../cross-origin-isolated.https.html          |  1 -
 ...ipt-src-elem-inline-speculation-rules.html |  1 -
 ...p-script-src-inline-speculation-rules.html |  1 -
 .../resources/csp-script-src-self.html        |  1 -
 .../csp-script-src-strict-dynamic.html        |  1 -
 .../csp-script-src-unsafe-inline.html         |  1 -
 .../resources/dedicated-worker.https.html     |  1 -
 .../resources/encrypted-media.https.html      |  1 -
 .../fetch-intercepted-by-service-worker.html  |  1 -
 .../prerender/resources/file-picker.html      |  1 -
 .../resources/generic-sensor.https.html       |  1 -
 .../resources/idle-detection.https.html       |  1 -
 .../iframe-added-post-activation.html         |  1 -
 .../resources/main-frame-navigation.html      |  1 -
 .../resources/media-autoplay-attribute.html   |  1 -
 ...edia-capabilities-decoding-info.https.html |  1 -
 ...edia-capabilities-encoding-info.https.html |  1 -
 .../resources/media-device-info.https.html    |  1 -
 .../resources/media-devices-access.https.html |  1 -
 .../prerender/resources/media-play.html       |  1 -
 .../prerender/resources/message-boxes.html    |  1 -
 .../prerender/resources/midi.https.html       |  1 -
 .../resources/navigator-plugins.html          |  1 -
 .../notification-before-activation.html       |  1 -
 .../prerender/resources/prerender-state.html  |  1 -
 .../resources/prerendered-iframe.html         |  1 -
 .../prerender/resources/prerendered-page.html |  1 -
 .../resources/presentation-request.html       |  1 -
 .../resources/prompt-by-before-unload.html    |  1 -
 .../prerender/resources/push.https.html       |  1 -
 .../resources/register-service-worker.html    |  1 -
 .../resources/request-picture-in-picture.html |  1 -
 .../prerender/resources/sandbox-iframe.html   |  1 -
 .../resources/screen-capture.https.html       |  1 -
 .../screen-orientation-lock.https.html        |  1 -
 .../resources/service-worker-unregister.html  |  1 -
 .../resources/service-worker-update.html      |  1 -
 ...-storage-carry-over-to-prerender-page.html |  1 -
 ...n-storage-isolated-while-prerendering.html |  1 -
 ...ion-storage-no-leak-to-initiator-page.html |  1 -
 .../session-storage-swap-after-activate.html  |  1 -
 .../resources/speech-synthesis.https.html     |  1 -
 .../resources/storage-persist.https.html      |  1 -
 .../prerender/resources/wake-lock.https.html  |  1 -
 .../prerender/resources/web-hid.https.html    |  1 -
 .../prerender/resources/web-locks.html        |  1 -
 .../prerender/resources/web-nfc.https.html    |  1 -
 .../prerender/resources/web-serial.https.html |  1 -
 .../prerender/resources/web-share.https.html  |  1 -
 .../prerender/resources/web-usb.https.html    |  1 -
 .../web-xr-immersive-vr-session.https.html    |  1 -
 .../web-xr-inline-session.https.html          |  1 -
 .../prerender/resources/window-move.html      |  1 -
 .../window-open-during-prerendering.html      |  1 -
 .../window-open-in-prerenderingchange.html    |  1 -
 .../prerender/resources/window-resize.html    |  1 -
 .../windowclient-navigate-on-iframe.html      |  1 -
 tools/lint/lint.py                            | 12 +++----
 tools/lint/rules.py                           |  5 +++
 .../tests/dummy/{ => ref}/about_blank.html    |  0
 tools/lint/tests/test_lint.py                 |  2 +-
 .../resources/new-shared-worker-window.html   |  1 -
 .../modules/resources/new-worker-window.html  |  1 -
 worklets/resources/addmodule-window.html      |  1 -
 worklets/resources/referrer-window.html       |  1 -
 143 files changed, 47 insertions(+), 143 deletions(-)
 rename tools/lint/tests/dummy/{ => ref}/about_blank.html (100%)

diff --git a/appmanifest/protocol_handlers-member/resources/protocol_handlers_entry.html b/appmanifest/protocol_handlers-member/resources/protocol_handlers_entry.html
index c5fa629f22bfda..9477fa37dd7f99 100644
--- a/appmanifest/protocol_handlers-member/resources/protocol_handlers_entry.html
+++ b/appmanifest/protocol_handlers-member/resources/protocol_handlers_entry.html
@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <title>Protocol Handling Web Platform Test - Pass</title>
   <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
   <script>
     setup({ single_test: true });
     const urlParams = new URLSearchParams(window.location.search);
diff --git a/client-hints/sandbox/resources/embedded-popup-expect-hints.html b/client-hints/sandbox/resources/embedded-popup-expect-hints.html
index 6cd5f0a29ee123..5503180023389d 100644
--- a/client-hints/sandbox/resources/embedded-popup-expect-hints.html
+++ b/client-hints/sandbox/resources/embedded-popup-expect-hints.html
@@ -2,7 +2,6 @@
 <html>
 <body>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="util.js"></script>
 <script>
 sandbox_popup_listener("/client-hints/resources/expect-client-hints-headers.html");
diff --git a/client-hints/sandbox/resources/embedded-popup-expect-no-hints.html b/client-hints/sandbox/resources/embedded-popup-expect-no-hints.html
index 46dbb7f23655e2..16d89ca32dd34c 100644
--- a/client-hints/sandbox/resources/embedded-popup-expect-no-hints.html
+++ b/client-hints/sandbox/resources/embedded-popup-expect-no-hints.html
@@ -2,7 +2,6 @@
 <html>
 <body>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="util.js"></script>
 <script>
 sandbox_popup_listener("/client-hints/resources/expect-no-client-hints-headers.html");
diff --git a/compute-pressure/resources/support-iframe.html b/compute-pressure/resources/support-iframe.html
index 6b2b3097926b19..c0b6337d718d11 100644
--- a/compute-pressure/resources/support-iframe.html
+++ b/compute-pressure/resources/support-iframe.html
@@ -2,7 +2,6 @@
 <meta charset="utf-8">
 <title>compute pressure iframe tester</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script>
 async function messageHandler(e) {
   if (e.data.command === 'start') {
diff --git a/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html b/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html
index 993b6bfd4be7de..8f43a07664c11c 100644
--- a/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html
+++ b/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html
@@ -2,7 +2,6 @@
 <html>
 <body>
     <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
     <script src='/content-security-policy/frame-ancestors/support/frame-ancestors-test.sub.js'></script>
 
     <span id="escape">{{GET[policy]}}</span>
diff --git a/content-security-policy/navigation/support/test_csp_self_window.sub.html b/content-security-policy/navigation/support/test_csp_self_window.sub.html
index 2f7b685a751648..081fadef2a3c19 100644
--- a/content-security-policy/navigation/support/test_csp_self_window.sub.html
+++ b/content-security-policy/navigation/support/test_csp_self_window.sub.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 
 <span id="escape">{{GET[window_url]}}</span>
 
diff --git a/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-embed.html b/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-embed.html
index 05a99626dc4211..2f9bb18779a064 100644
--- a/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-embed.html
+++ b/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-embed.html
@@ -3,7 +3,6 @@
 <meta name="timeout" content="long">
 <title>Test site embedded in a cross-site context</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
 <script src="/cookies/partitioned-cookies/resources/test-helpers.js"></script>
diff --git a/cookies/partitioned-cookies/resources/partitioned-cookies-top-level-redirect.html b/cookies/partitioned-cookies/resources/partitioned-cookies-top-level-redirect.html
index c94beff5285578..4de2862474e1c4 100644
--- a/cookies/partitioned-cookies/resources/partitioned-cookies-top-level-redirect.html
+++ b/cookies/partitioned-cookies/resources/partitioned-cookies-top-level-redirect.html
@@ -3,7 +3,6 @@
 <meta name="timeout" content="long">
 <title>Test partitioned cookie top level cross-site</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
 <script src="/cookies/partitioned-cookies/resources/test-helpers.js"></script>
diff --git a/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embed.html b/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embed.html
index 2d579c91bed92b..54a7ba5cda2a93 100644
--- a/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embed.html
+++ b/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embed.html
@@ -3,7 +3,6 @@
 <meta name="timeout" content="long">
 <title>Test site embedded in a cross-site context</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
 <script src="/cookies/third-party-cookies/resources/test-helpers.js"></script>
diff --git a/fenced-frame/resources/automatic-beacon-unfenced-page.html b/fenced-frame/resources/automatic-beacon-unfenced-page.html
index c9561bec550591..098179eea1bcbf 100644
--- a/fenced-frame/resources/automatic-beacon-unfenced-page.html
+++ b/fenced-frame/resources/automatic-beacon-unfenced-page.html
@@ -2,7 +2,6 @@
 <title>Page navigated to by an _unfencedTop navigation</title>
 
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 
diff --git a/fenced-frame/resources/background-fetch-inner.https.html b/fenced-frame/resources/background-fetch-inner.https.html
index 1bca25a957a3fe..de19d2bc36f1c8 100644
--- a/fenced-frame/resources/background-fetch-inner.https.html
+++ b/fenced-frame/resources/background-fetch-inner.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <title>Fenced frame content to report the result of background fetch</title>
 
diff --git a/fenced-frame/resources/background-fetch-sw-inner.https.html b/fenced-frame/resources/background-fetch-sw-inner.https.html
index 78e58e5bbf5e4f..329a37cf802075 100644
--- a/fenced-frame/resources/background-fetch-sw-inner.https.html
+++ b/fenced-frame/resources/background-fetch-sw-inner.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <title>Fenced frame content to report the result of background fetch in SW</title>
 
diff --git a/fenced-frame/resources/background-sync-inner.https.html b/fenced-frame/resources/background-sync-inner.https.html
index 81974c803ad19b..0ed60a5f20938d 100644
--- a/fenced-frame/resources/background-sync-inner.https.html
+++ b/fenced-frame/resources/background-sync-inner.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <title>Fenced frame content to report the result of background sync's register</title>
 
diff --git a/fenced-frame/resources/background-sync-sw-inner.https.html b/fenced-frame/resources/background-sync-sw-inner.https.html
index b9521a4e20add8..42f47e5d13f592 100644
--- a/fenced-frame/resources/background-sync-sw-inner.https.html
+++ b/fenced-frame/resources/background-sync-sw-inner.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <title>Fenced frame content to report the result of background sync's register in SW</title>
 
diff --git a/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html b/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html
index 4fe496f29c8480..ea41d0df29c5f5 100644
--- a/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html
+++ b/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>child frame with delayed onload event</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 
 <body>
diff --git a/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html b/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html
index 74800b969f772c..0f40ccf8c0b3fe 100644
--- a/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html
+++ b/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>Navigate ancestor helper</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 
 <body>
diff --git a/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html b/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html
index 63a0cca8b4f2d2..b6adfec4235a3b 100644
--- a/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html
+++ b/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>Navigate ancestor helper from nested fenced frame</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 
 <body>
diff --git a/fenced-frame/resources/navigate-ancestor-test-runner.https.html b/fenced-frame/resources/navigate-ancestor-test-runner.https.html
index d0f2e8d694a651..8033fea6ecc68f 100644
--- a/fenced-frame/resources/navigate-ancestor-test-runner.https.html
+++ b/fenced-frame/resources/navigate-ancestor-test-runner.https.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>Test navigating an ancestor frame from within a fenced frame</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 
 <body>
diff --git a/fenced-frame/resources/permission-geolocation-test-runner.html b/fenced-frame/resources/permission-geolocation-test-runner.html
index 724a35ce9a568b..8a0a894d26738a 100644
--- a/fenced-frame/resources/permission-geolocation-test-runner.html
+++ b/fenced-frame/resources/permission-geolocation-test-runner.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>Fenced frame content to report the result of navigator.geolocation.getCurrentPosition()</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="utils.js"></script>
diff --git a/fenced-frame/resources/window-navigation-204-inner.html b/fenced-frame/resources/window-navigation-204-inner.html
index e5e5adef1d6f2b..a48746885086f2 100644
--- a/fenced-frame/resources/window-navigation-204-inner.html
+++ b/fenced-frame/resources/window-navigation-204-inner.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <title>Fenced frame content to report the value of window.navigation</title>
 
diff --git a/fetch/connection-pool/resources/network-partition-about-blank-checker.html b/fetch/connection-pool/resources/network-partition-about-blank-checker.html
index 7a8b61323752d2..1bcf589e74037a 100644
--- a/fetch/connection-pool/resources/network-partition-about-blank-checker.html
+++ b/fetch/connection-pool/resources/network-partition-about-blank-checker.html
@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <title>about:blank Network Partition Checker</title>
   <meta name="help" href="https://fetch.spec.whatwg.org/#network-partition-keys">
-  <meta name="timeout" content="normal">
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <body>
 <script>
diff --git a/fetch/connection-pool/resources/network-partition-checker.html b/fetch/connection-pool/resources/network-partition-checker.html
index b058f611242bb8..31d115589d2aaa 100644
--- a/fetch/connection-pool/resources/network-partition-checker.html
+++ b/fetch/connection-pool/resources/network-partition-checker.html
@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <title>Network Partition Checker</title>
   <meta name="help" href="https://fetch.spec.whatwg.org/#network-partition-keys">
-  <meta name="timeout" content="normal">
   <script src="SUBRESOURCE_PREFIX:&dispatch=fetch_file&path=common/utils.js"></script>
   <script src="SUBRESOURCE_PREFIX:&dispatch=fetch_file&path=resources/testharness.js"></script>
   <script src="SUBRESOURCE_PREFIX:&dispatch=fetch_file&path=fetch/connection-pool/resources/network-partition-key.js"></script>
diff --git a/fetch/connection-pool/resources/network-partition-iframe-checker.html b/fetch/connection-pool/resources/network-partition-iframe-checker.html
index f76ed1844719c9..34f63369b0fc9e 100644
--- a/fetch/connection-pool/resources/network-partition-iframe-checker.html
+++ b/fetch/connection-pool/resources/network-partition-iframe-checker.html
@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <title>Iframe Network Partition Checker</title>
   <meta name="help" href="https://fetch.spec.whatwg.org/#network-partition-keys">
-  <meta name="timeout" content="normal">
   <script src="SUBRESOURCE_PREFIX:&dispatch=fetch_file&path=common/utils.js"></script>
   <script src="SUBRESOURCE_PREFIX:&dispatch=fetch_file&path=resources/testharness.js"></script>
   <script src="SUBRESOURCE_PREFIX:&dispatch=fetch_file&path=fetch/connection-pool/resources/network-partition-key.js"></script>
diff --git a/fetch/connection-pool/resources/network-partition-worker-checker.html b/fetch/connection-pool/resources/network-partition-worker-checker.html
index e6b7ea7673fe79..c3f8970c9d1d79 100644
--- a/fetch/connection-pool/resources/network-partition-worker-checker.html
+++ b/fetch/connection-pool/resources/network-partition-worker-checker.html
@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <title>Worker Network Partition Checker</title>
   <meta name="help" href="https://fetch.spec.whatwg.org/#network-partition-keys">
-  <meta name="timeout" content="normal">
   <script src="SUBRESOURCE_PREFIX:&dispatch=fetch_file&path=common/utils.js"></script>
   <script src="SUBRESOURCE_PREFIX:&dispatch=fetch_file&path=resources/testharness.js"></script>
   <script src="SUBRESOURCE_PREFIX:&dispatch=fetch_file&path=fetch/connection-pool/resources/network-partition-key.js"></script>
diff --git a/fetch/http-cache/resources/split-cache-popup-with-iframe.html b/fetch/http-cache/resources/split-cache-popup-with-iframe.html
index 48b16180cfdfa5..786647c0ff2f13 100644
--- a/fetch/http-cache/resources/split-cache-popup-with-iframe.html
+++ b/fetch/http-cache/resources/split-cache-popup-with-iframe.html
@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <title>HTTP Cache - helper</title>
   <meta name="help" href="https://fetch.spec.whatwg.org/#http-cache-partitions">
-  <meta name="timeout" content="normal">
   <script src="/resources/testharness.js"></script>
   <script src="/common/get-host-info.sub.js"></script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/fetch/http-cache/resources/split-cache-popup.html b/fetch/http-cache/resources/split-cache-popup.html
index edb579479414fe..623fb48784b016 100644
--- a/fetch/http-cache/resources/split-cache-popup.html
+++ b/fetch/http-cache/resources/split-cache-popup.html
@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <title>HTTP Cache - helper</title>
   <meta name="help" href="https://fetch.spec.whatwg.org/#http-cache-partitions">
-  <meta name="timeout" content="normal">
   <script src="/resources/testharness.js"></script>
   <script src="../http-cache.js"></script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/focus/support/focus-event-after-switching-iframes-inner.html b/focus/support/focus-event-after-switching-iframes-inner.html
index 33b26c15822b6b..3a10b140980cf1 100644
--- a/focus/support/focus-event-after-switching-iframes-inner.html
+++ b/focus/support/focus-event-after-switching-iframes-inner.html
@@ -5,6 +5,7 @@
   <title>Focus event inner document</title>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src="/resources/testdriver-actions.js"></script>
 <body>
 <h1>Inner</h1>
diff --git a/html/browsers/browsing-the-web/history-traversal/pagereveal/resources/order-in-prerender-activation-popup.html b/html/browsers/browsing-the-web/history-traversal/pagereveal/resources/order-in-prerender-activation-popup.html
index 78989adc172997..e42f113609aff3 100644
--- a/html/browsers/browsing-the-web/history-traversal/pagereveal/resources/order-in-prerender-activation-popup.html
+++ b/html/browsers/browsing-the-web/history-traversal/pagereveal/resources/order-in-prerender-activation-popup.html
@@ -2,7 +2,6 @@
 <title>pagereveal event fires and in correct order on prerender activation (popup)</title>
 <link rel="author" href="mailto:bokan@chromium.org">
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script>
 const params = new URLSearchParams(location.search);
diff --git a/intersection-observer/resources/observer-in-iframe-subframe.html b/intersection-observer/resources/observer-in-iframe-subframe.html
index 9d0769ae44a1bb..74f68186c7c5de 100644
--- a/intersection-observer/resources/observer-in-iframe-subframe.html
+++ b/intersection-observer/resources/observer-in-iframe-subframe.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="./intersection-observer-test-utils.js"></script>
 
 <style>
diff --git a/lint.ignore b/lint.ignore
index 62ad931cb83b0f..213649dfea91b4 100644
--- a/lint.ignore
+++ b/lint.ignore
@@ -75,6 +75,12 @@ AHEM COPY: fonts/Ahem.ttf
 # None of these are actually Ahem
 AHEM COPY: fonts/ahem-extra/AHEM_*.TTF
 
+## Ignore the testharness.js unit tests
+INVALID-TIMEOUT: resources/test/*
+TESTHARNESS-PATH: resources/test/*
+TESTHARNESSREPORT-IN-UNSUPPORTED-TYPE: resources/test/*
+TESTHARNESSREPORT-PATH: resources/test/*
+
 ## Test exclusions ##
 
 # Intentional use of CRLF
@@ -138,6 +144,12 @@ PARSE-FAILED: dom/nodes/Document-createElement-namespace-tests/minimal_html.xhtm
 PARSE-FAILED: dom/nodes/Document-createElement-namespace-tests/minimal_html.xml
 PARSE-FAILED: custom-elements/xhtml-crash.xhtml
 
+# Files that don't parse because UTF-32 support is gone
+PARSE-FAILED: encoding/resources/utf-32-little-endian-nobom.xml
+PARSE-FAILED: encoding/resources/utf-32-little-endian-bom.xml
+PARSE-FAILED: encoding/resources/utf-32-big-endian-nobom.xml
+PARSE-FAILED: encoding/resources/utf-32-big-endian-bom.xml
+
 # setTimeout usage (should probably mostly be fixed)
 SET TIMEOUT: *-manual.*
 SET TIMEOUT: annotation-model/scripts/ajv.min.js
@@ -461,6 +473,18 @@ INDENT TABS: css/mediaqueries/*
 INDENT TABS: css/selectors/*
 INDENT TABS: css/WOFF2/*
 
+## Templates can deal with certain things being wrong; we only care about the output
+INVALID-TIMEOUT: */templates/*
+NON-EXISTENT-REF: */*-template.html
+NON-EXISTENT-REF: */templates/*
+NON-EXISTENT-REF: css/css-images/tools/template-object-fit-test.html
+NON-EXISTENT-REF: css/css-images/tools/template-object-position-test.html
+REFERENCE-IN-OTHER-TYPE: */*-template.html
+REFERENCE-IN-OTHER-TYPE: */templates/*
+REFERENCE-IN-OTHER-TYPE: css/css-images/tools/template-object-fit-test.html
+REFERENCE-IN-OTHER-TYPE: css/css-images/tools/template-object-position-test.html
+TESTHARNESSREPORT-IN-UNSUPPORTED-TYPE: */templates/*
+TESTHARNESSREPORT-IN-UNSUPPORTED-TYPE: css/css-writing-modes/tools/generators/template.html
 
 ## Things we're stopping from getting worse
 CONSOLE: css/css-shapes/shape-outside/supported-shapes/support/test-utils.js
@@ -818,3 +842,12 @@ TESTDRIVER-IN-UNSUPPORTED-TYPE: payment-handler/change-shipping-option-manual.ht
 TESTDRIVER-IN-UNSUPPORTED-TYPE: payment-handler/payment-request-event-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: payment-handler/supports-shipping-contact-delegation-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: shadow-dom/crashtests/move-to-new-tree-1343016.html
+
+# Intentional use of testharness.js with an absolute URL
+TESTHARNESS-PATH: fetch/connection-pool/resources/network-partition-checker.html
+TESTHARNESS-PATH: fetch/connection-pool/resources/network-partition-iframe-checker.html
+TESTHARNESS-PATH: fetch/connection-pool/resources/network-partition-worker-checker.html
+
+# View Transitions tests include references relative to the original test URL
+NON-EXISTENT-REF: css/css-view-transitions/navigation/resources/*
+REFERENCE-IN-OTHER-TYPE: css/css-view-transitions/navigation/resources/*
diff --git a/loading/early-hints/resources/404-with-early-hints.html b/loading/early-hints/resources/404-with-early-hints.html
index 2d351b08b8adba..6095811b4398c4 100644
--- a/loading/early-hints/resources/404-with-early-hints.html
+++ b/loading/early-hints/resources/404-with-early-hints.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/arbitrary-header-in-early-hints.html b/loading/early-hints/resources/arbitrary-header-in-early-hints.html
index cc939f5ea69c00..461ff6010dd231 100644
--- a/loading/early-hints/resources/arbitrary-header-in-early-hints.html
+++ b/loading/early-hints/resources/arbitrary-header-in-early-hints.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <body>
 <script>
 promise_test(async (t) => {
diff --git a/loading/early-hints/resources/coep-mismatch.html b/loading/early-hints/resources/coep-mismatch.html
index 1811bf5506febc..8b6c491c0cd35f 100644
--- a/loading/early-hints/resources/coep-mismatch.html
+++ b/loading/early-hints/resources/coep-mismatch.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/csp-basic.html b/loading/early-hints/resources/csp-basic.html
index 0086711fb7c7bb..617e3950b1f73d 100644
--- a/loading/early-hints/resources/csp-basic.html
+++ b/loading/early-hints/resources/csp-basic.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/csp-document-disallow.html b/loading/early-hints/resources/csp-document-disallow.html
index 53b6ee232dc38e..466fc13767f1ff 100644
--- a/loading/early-hints/resources/csp-document-disallow.html
+++ b/loading/early-hints/resources/csp-document-disallow.html
@@ -2,7 +2,6 @@
 <meta charset=utf-8>
 <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="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/modulepreload-in-early-hints.html b/loading/early-hints/resources/modulepreload-in-early-hints.html
index 64a02855040dba..e10acb795fde31 100644
--- a/loading/early-hints/resources/modulepreload-in-early-hints.html
+++ b/loading/early-hints/resources/modulepreload-in-early-hints.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/multiple-early-hints-responses.html b/loading/early-hints/resources/multiple-early-hints-responses.html
index 3be2852348ba80..683808b1112d58 100644
--- a/loading/early-hints/resources/multiple-early-hints-responses.html
+++ b/loading/early-hints/resources/multiple-early-hints-responses.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/preconnect-in-early-hints.html b/loading/early-hints/resources/preconnect-in-early-hints.html
index 8ec8fde5e67683..9af2a8236d0491 100644
--- a/loading/early-hints/resources/preconnect-in-early-hints.html
+++ b/loading/early-hints/resources/preconnect-in-early-hints.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/preload-as-test.html b/loading/early-hints/resources/preload-as-test.html
index daea33160ae4e7..0e6761a0601d6b 100644
--- a/loading/early-hints/resources/preload-as-test.html
+++ b/loading/early-hints/resources/preload-as-test.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/preload-fetch.html b/loading/early-hints/resources/preload-fetch.html
index 2e90f76af143fc..576970e9b7b2eb 100644
--- a/loading/early-hints/resources/preload-fetch.html
+++ b/loading/early-hints/resources/preload-fetch.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/preload-fetchpriority.html b/loading/early-hints/resources/preload-fetchpriority.html
index 38e56a9b67dc85..3711e34c348ff3 100644
--- a/loading/early-hints/resources/preload-fetchpriority.html
+++ b/loading/early-hints/resources/preload-fetchpriority.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/preload-finished-before-final-response.html b/loading/early-hints/resources/preload-finished-before-final-response.html
index d965b4042039db..eb441930b8fadb 100644
--- a/loading/early-hints/resources/preload-finished-before-final-response.html
+++ b/loading/early-hints/resources/preload-finished-before-final-response.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.html b/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.html
index 5a233612b27d68..1de8471544a4f0 100644
--- a/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.html
+++ b/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/preload-in-flight-when-consumed.html b/loading/early-hints/resources/preload-in-flight-when-consumed.html
index 5075d928464aff..83a68c9ca841bf 100644
--- a/loading/early-hints/resources/preload-in-flight-when-consumed.html
+++ b/loading/early-hints/resources/preload-in-flight-when-consumed.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/preload-initiator-type.html b/loading/early-hints/resources/preload-initiator-type.html
index 0fdeb2b9037be8..f9ee6367c01d11 100644
--- a/loading/early-hints/resources/preload-initiator-type.html
+++ b/loading/early-hints/resources/preload-initiator-type.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/redirect-cross-origin-between-early-hints.html b/loading/early-hints/resources/redirect-cross-origin-between-early-hints.html
index 46560bb2da8b79..0ad7955876f313 100644
--- a/loading/early-hints/resources/redirect-cross-origin-between-early-hints.html
+++ b/loading/early-hints/resources/redirect-cross-origin-between-early-hints.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/redirect-cross-origin.html b/loading/early-hints/resources/redirect-cross-origin.html
index 39b37f81300bd7..62906faf279615 100644
--- a/loading/early-hints/resources/redirect-cross-origin.html
+++ b/loading/early-hints/resources/redirect-cross-origin.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/redirect-same-origin-between-early-hints.html b/loading/early-hints/resources/redirect-same-origin-between-early-hints.html
index 395f7f1752500c..829efdb7965372 100644
--- a/loading/early-hints/resources/redirect-same-origin-between-early-hints.html
+++ b/loading/early-hints/resources/redirect-same-origin-between-early-hints.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/redirect-same-origin.html b/loading/early-hints/resources/redirect-same-origin.html
index 6a2246a2acd8cd..1b3d121a213335 100644
--- a/loading/early-hints/resources/redirect-same-origin.html
+++ b/loading/early-hints/resources/redirect-same-origin.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/loading/early-hints/resources/referrer-policy-test.html b/loading/early-hints/resources/referrer-policy-test.html
index d0389c2e11cce3..05f98f005c972e 100644
--- a/loading/early-hints/resources/referrer-policy-test.html
+++ b/loading/early-hints/resources/referrer-policy-test.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="early-hints-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html b/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html
index 7676378a23fb1b..e7eb038ea36715 100644
--- a/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html
+++ b/nav-tracking-mitigations/resources/cross-origin-client-redirect-with-cookie-header.sub.https.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <meta charset=utf-8>
 <script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
 <script>
   // `document.cookie` is set using the `Set-Cookie` HTTP header in
   // cross-origin-client-redirect-with-cookie-header.sub.https.html.headers.
diff --git a/nav-tracking-mitigations/resources/redirect-chain-start.sub.https.html b/nav-tracking-mitigations/resources/redirect-chain-start.sub.https.html
index a1655f4483ea4c..550fc94a971332 100644
--- a/nav-tracking-mitigations/resources/redirect-chain-start.sub.https.html
+++ b/nav-tracking-mitigations/resources/redirect-chain-start.sub.https.html
@@ -3,6 +3,7 @@
 <title>Bounce Tracking Mitigations: Stateful Client Bounce (Start Page)</title>
 <body></body>
 <script src=/resources/testdriver.js></script>
+<script src=/resources/testdriver-vendor.js></script>
 <script>
   const url = new URL(
     'cross-origin-client-redirect-with-cookie-header.sub.https.html',
diff --git a/performance-timeline/resources/going-back.html b/performance-timeline/resources/going-back.html
index f4a26669baa163..0d28d59b8064db 100644
--- a/performance-timeline/resources/going-back.html
+++ b/performance-timeline/resources/going-back.html
@@ -1,6 +1,5 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 
 <script>
 onload = (event) => {
diff --git a/presentation-api/controlling-ua/support/iframe.html b/presentation-api/controlling-ua/support/iframe.html
index e2171deaa83416..e9c2c31c637abe 100644
--- a/presentation-api/controlling-ua/support/iframe.html
+++ b/presentation-api/controlling-ua/support/iframe.html
@@ -5,7 +5,6 @@
 <link rel="author" title="Tomoyuki Shimizu" href="/tomoyukilabs/">
 <link rel="help" href="http://w3c.github.io/presentation-api/#dom-presentationrequest-start">
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="../common.js"></script>
 <script>
     add_completion_callback((tests, status) => {
diff --git a/presentation-api/receiving-ua/support/PresentationConnectionList_onconnectionavailable_receiving-ua.html b/presentation-api/receiving-ua/support/PresentationConnectionList_onconnectionavailable_receiving-ua.html
index 74d8dfa0ed64bc..0fe09373e10964 100644
--- a/presentation-api/receiving-ua/support/PresentationConnectionList_onconnectionavailable_receiving-ua.html
+++ b/presentation-api/receiving-ua/support/PresentationConnectionList_onconnectionavailable_receiving-ua.html
@@ -5,7 +5,6 @@
 <link rel="author" title="Tomoyuki Shimizu" href="/tomoyukilabs">
 <link rel="help" href="https://w3c.github.io/presentation-api/#monitoring-incoming-presentation-connections">
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="../common.js"></script>
 <script src="stash.js"></script>
 
diff --git a/presentation-api/receiving-ua/support/PresentationConnection_onclose_receiving-ua.html b/presentation-api/receiving-ua/support/PresentationConnection_onclose_receiving-ua.html
index 7194c6f4d96882..7ebcfe25c942b0 100644
--- a/presentation-api/receiving-ua/support/PresentationConnection_onclose_receiving-ua.html
+++ b/presentation-api/receiving-ua/support/PresentationConnection_onclose_receiving-ua.html
@@ -5,7 +5,6 @@
 <link rel="author" title="Tomoyuki Shimizu" href="/tomoyukilabs">
 <link rel="help" href="https://w3c.github.io/presentation-api/#closing-a-presentationconnection">
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="../common.js"></script>
 <script src="stash.js"></script>
 
diff --git a/presentation-api/receiving-ua/support/PresentationConnection_onmessage_receiving-ua.html b/presentation-api/receiving-ua/support/PresentationConnection_onmessage_receiving-ua.html
index 0734a5570c21b3..4738473ffa772c 100644
--- a/presentation-api/receiving-ua/support/PresentationConnection_onmessage_receiving-ua.html
+++ b/presentation-api/receiving-ua/support/PresentationConnection_onmessage_receiving-ua.html
@@ -4,7 +4,6 @@
 <link rel="author" title="Tomoyuki Shimizu" href="/tomoyukilabs/">
 <link rel="help" href="http://w3c.github.io/presentation-api/#receiving-a-message-through-presentationconnection">
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="../common.js"></script>
 <script src="stash.js"></script>
 
diff --git a/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua.html b/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua.html
index 53f760144233cc..aceb718f04a688 100644
--- a/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua.html
+++ b/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua.html
@@ -5,7 +5,6 @@
 <link rel="author" title="Tomoyuki Shimizu" href="/tomoyukilabs/">
 <link rel="help" href="https://w3c.github.io/presentation-api/#creating-a-receiving-browsing-context">
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="../common.js"></script>
 <script src="stash.js"></script>
 <style>
diff --git a/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua_child.html b/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua_child.html
index 2f67f7fac02f96..2bf70a44b7e9be 100644
--- a/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua_child.html
+++ b/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua_child.html
@@ -5,7 +5,6 @@
 <link rel="author" title="Tomoyuki Shimizu" href="/tomoyukilabs/">
 <link rel="help" href="https://w3c.github.io/presentation-api/#creating-a-receiving-browsing-context">
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <p id="notice">Checking <code id="modal"></code>: if you see this message, please wait for test to time out.</p>
 
 <script>
diff --git a/presentation-api/receiving-ua/support/PresentationReceiver_unreached_receiving-ua.html b/presentation-api/receiving-ua/support/PresentationReceiver_unreached_receiving-ua.html
index 2b2a8b315efad5..9c1f30060c1254 100644
--- a/presentation-api/receiving-ua/support/PresentationReceiver_unreached_receiving-ua.html
+++ b/presentation-api/receiving-ua/support/PresentationReceiver_unreached_receiving-ua.html
@@ -5,7 +5,6 @@
 <link rel="author" title="Tomoyuki Shimizu" href="/tomoyukilabs/">
 <link rel="help" href="https://w3c.github.io/presentation-api/#creating-a-receiving-browsing-context">
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="../common.js"></script>
 <script src="stash.js"></script>
 <script>
diff --git a/presentation-api/receiving-ua/support/idlharness_receiving-ua.html b/presentation-api/receiving-ua/support/idlharness_receiving-ua.html
index 2d5a5b17f14eb6..1042e2317a8d0d 100644
--- a/presentation-api/receiving-ua/support/idlharness_receiving-ua.html
+++ b/presentation-api/receiving-ua/support/idlharness_receiving-ua.html
@@ -5,7 +5,6 @@
 <link rel="author" title="Tomoyuki Shimizu" href="/tomoyukilabs">
 <link rel="help" href="http://w3c.github.io/presentation-api/#dfn-receiving-user-agent">
 <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 src="../common.js"></script>
diff --git a/resource-timing/resources/frameset-timing-frame.html b/resource-timing/resources/frameset-timing-frame.html
index e260f575268e6c..e2a3c99e683ffc 100644
--- a/resource-timing/resources/frameset-timing-frame.html
+++ b/resource-timing/resources/frameset-timing-frame.html
@@ -1,5 +1,4 @@
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="./frame-timing.js"></script>
 
 <script>
diff --git a/service-workers/service-worker/navigation-preload/resources/samesite-sw-helper.html b/service-workers/service-worker/navigation-preload/resources/samesite-sw-helper.html
index 51fdc9ec74bd0a..4c0abd660c7546 100644
--- a/service-workers/service-worker/navigation-preload/resources/samesite-sw-helper.html
+++ b/service-workers/service-worker/navigation-preload/resources/samesite-sw-helper.html
@@ -2,7 +2,6 @@
 <meta charset="utf-8">
 <title>Navigation Preload Same Site SW registrator</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="../../resources/test-helpers.sub.js"></script>
 <script>
 
diff --git a/service-workers/service-worker/resources/claim-with-redirect-iframe.html b/service-workers/service-worker/resources/claim-with-redirect-iframe.html
index 4150d7e6857422..d80423aba34786 100644
--- a/service-workers/service-worker/resources/claim-with-redirect-iframe.html
+++ b/service-workers/service-worker/resources/claim-with-redirect-iframe.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="test-helpers.sub.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <body>
diff --git a/service-workers/service-worker/resources/clients-get-cross-origin-frame.html b/service-workers/service-worker/resources/clients-get-cross-origin-frame.html
index e16bb1116dc810..4b235ee0e3110e 100644
--- a/service-workers/service-worker/resources/clients-get-cross-origin-frame.html
+++ b/service-workers/service-worker/resources/clients-get-cross-origin-frame.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js"></script>
 <script>
diff --git a/shared-storage-selecturl-limit/resources/run-url-selection-operation-limit-inner.https.html b/shared-storage-selecturl-limit/resources/run-url-selection-operation-limit-inner.https.html
index c5d057f3e2ffc6..560fd4c393d955 100644
--- a/shared-storage-selecturl-limit/resources/run-url-selection-operation-limit-inner.https.html
+++ b/shared-storage-selecturl-limit/resources/run-url-selection-operation-limit-inner.https.html
@@ -1,6 +1,5 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/common/utils.js"></script>
 <script src="/shared-storage-selecturl-limit/resources/utils.js"></script>
 <script src="/shared-storage/resources/util.js"></script>
diff --git a/shared-storage/resources/cross-origin-worklet-in-sandboxed-frame-inner.https.sub.html b/shared-storage/resources/cross-origin-worklet-in-sandboxed-frame-inner.https.sub.html
index f5e41c84d55755..f73a0bf92cced9 100644
--- a/shared-storage/resources/cross-origin-worklet-in-sandboxed-frame-inner.https.sub.html
+++ b/shared-storage/resources/cross-origin-worklet-in-sandboxed-frame-inner.https.sub.html
@@ -1,6 +1,5 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/common/utils.js"></script>
 <script src="/shared-storage/resources/util.js"></script>
 <script src="/fenced-frame/resources/utils.js"></script>
diff --git a/shared-storage/resources/select-url-permissions-policy-helper.html b/shared-storage/resources/select-url-permissions-policy-helper.html
index 896daa59828a48..6561e910d4c753 100644
--- a/shared-storage/resources/select-url-permissions-policy-helper.html
+++ b/shared-storage/resources/select-url-permissions-policy-helper.html
@@ -1,7 +1,6 @@
 <!doctype html>
 <body>
   <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
   <script src="/shared-storage/resources/util.js"></script>
   <script>
   'use strict';
diff --git a/shared-storage/resources/shared-storage-permissions-policy-helper.html b/shared-storage/resources/shared-storage-permissions-policy-helper.html
index dd1bf50cf42c0a..1e7b1c961cc8dc 100644
--- a/shared-storage/resources/shared-storage-permissions-policy-helper.html
+++ b/shared-storage/resources/shared-storage-permissions-policy-helper.html
@@ -1,7 +1,6 @@
 <!doctype html>
 <body>
   <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
   <script src="/shared-storage/resources/util.js"></script>
   <script>
   'use strict';
diff --git a/speculation-rules/prerender/resources/about-blank-iframes.html b/speculation-rules/prerender/resources/about-blank-iframes.html
index db99d586e2b8b9..dc2737c15cfb20 100644
--- a/speculation-rules/prerender/resources/about-blank-iframes.html
+++ b/speculation-rules/prerender/resources/about-blank-iframes.html
@@ -3,7 +3,6 @@
 <title>about:blank iframe initiator and prerendered page</title>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script>
 // Called by iframe-nav-to-about-blank in case empty.html loads before
diff --git a/speculation-rules/prerender/resources/audio-setSinkId.https.html b/speculation-rules/prerender/resources/audio-setSinkId.https.html
index 1121b20915fe6b..0897dfcf6c3a8a 100644
--- a/speculation-rules/prerender/resources/audio-setSinkId.https.html
+++ b/speculation-rules/prerender/resources/audio-setSinkId.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <audio controls id="beat" src="./bear-av1-opus.mp4" loop></audio>
diff --git a/speculation-rules/prerender/resources/background-fetch.https.html b/speculation-rules/prerender/resources/background-fetch.https.html
index 659a821e358e5b..fa9050c5f5e91f 100644
--- a/speculation-rules/prerender/resources/background-fetch.https.html
+++ b/speculation-rules/prerender/resources/background-fetch.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/background-sync.https.html b/speculation-rules/prerender/resources/background-sync.https.html
index dd452aa34518c0..822cb8d953a6f9 100644
--- a/speculation-rules/prerender/resources/background-sync.https.html
+++ b/speculation-rules/prerender/resources/background-sync.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/battery-status.https.html b/speculation-rules/prerender/resources/battery-status.https.html
index dc1e745cbe6c46..6dbeae7283b3ac 100644
--- a/speculation-rules/prerender/resources/battery-status.https.html
+++ b/speculation-rules/prerender/resources/battery-status.https.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/bluetooth-access.https.html b/speculation-rules/prerender/resources/bluetooth-access.https.html
index b14b46c09cada9..ae65925bf17a24 100644
--- a/speculation-rules/prerender/resources/bluetooth-access.https.html
+++ b/speculation-rules/prerender/resources/bluetooth-access.https.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/broadcast-channel.html b/speculation-rules/prerender/resources/broadcast-channel.html
index 14980720a1640d..b52f153003a322 100644
--- a/speculation-rules/prerender/resources/broadcast-channel.html
+++ b/speculation-rules/prerender/resources/broadcast-channel.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script src="deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/cross-origin-iframe.html b/speculation-rules/prerender/resources/cross-origin-iframe.html
index 10a3b62f0ec36c..7b648b908c2d72 100644
--- a/speculation-rules/prerender/resources/cross-origin-iframe.html
+++ b/speculation-rules/prerender/resources/cross-origin-iframe.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
diff --git a/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html b/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html
index acad3c3e64f6cc..6b8cae1cff06ae 100644
--- a/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html
+++ b/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <body>
 <script>
 assert_true(document.prerendering);
diff --git a/speculation-rules/prerender/resources/cross-origin-isolated.https.html b/speculation-rules/prerender/resources/cross-origin-isolated.https.html
index 4fdc6c954180e8..6e8ccf2c7aff7e 100644
--- a/speculation-rules/prerender/resources/cross-origin-isolated.https.html
+++ b/speculation-rules/prerender/resources/cross-origin-isolated.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <body>
 <script>
diff --git a/speculation-rules/prerender/resources/csp-script-src-elem-inline-speculation-rules.html b/speculation-rules/prerender/resources/csp-script-src-elem-inline-speculation-rules.html
index 19aff92206f06e..838af99f7558db 100644
--- a/speculation-rules/prerender/resources/csp-script-src-elem-inline-speculation-rules.html
+++ b/speculation-rules/prerender/resources/csp-script-src-elem-inline-speculation-rules.html
@@ -5,7 +5,6 @@
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script src="csp-script-src.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html b/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html
index febfbd01ba125c..888ab23529b96c 100644
--- a/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html
+++ b/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html
@@ -5,7 +5,6 @@
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script src="csp-script-src.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/csp-script-src-self.html b/speculation-rules/prerender/resources/csp-script-src-self.html
index 8dc382068a3479..513f99314ae33f 100644
--- a/speculation-rules/prerender/resources/csp-script-src-self.html
+++ b/speculation-rules/prerender/resources/csp-script-src-self.html
@@ -6,7 +6,6 @@
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script src="csp-script-src.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/csp-script-src-strict-dynamic.html b/speculation-rules/prerender/resources/csp-script-src-strict-dynamic.html
index 00db373c47a4df..0a496c386bb63c 100644
--- a/speculation-rules/prerender/resources/csp-script-src-strict-dynamic.html
+++ b/speculation-rules/prerender/resources/csp-script-src-strict-dynamic.html
@@ -6,7 +6,6 @@
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <script src="/common/utils.js" nonce="1"></script>
 <script src="/resources/testharness.js" nonce="2"></script>
-<script src="/resources/testharnessreport.js" nonce="3"></script>
 <script src="utils.js" nonce="4"></script>
 <script src="csp-script-src.js" nonce="5"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html b/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html
index d2f010dc569d09..5b08e5c3bc4c8c 100644
--- a/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html
+++ b/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html
@@ -5,6 +5,5 @@
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script src="csp-script-src.js"></script>
diff --git a/speculation-rules/prerender/resources/dedicated-worker.https.html b/speculation-rules/prerender/resources/dedicated-worker.https.html
index 570d4b33a147e0..a4fc03697e3fca 100644
--- a/speculation-rules/prerender/resources/dedicated-worker.https.html
+++ b/speculation-rules/prerender/resources/dedicated-worker.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/encrypted-media.https.html b/speculation-rules/prerender/resources/encrypted-media.https.html
index 1c3a3ab0ea0379..f67ea9d8cb4978 100644
--- a/speculation-rules/prerender/resources/encrypted-media.https.html
+++ b/speculation-rules/prerender/resources/encrypted-media.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/fetch-intercepted-by-service-worker.html b/speculation-rules/prerender/resources/fetch-intercepted-by-service-worker.html
index 46aefb4e153d2d..9c25a6cfe31dc8 100644
--- a/speculation-rules/prerender/resources/fetch-intercepted-by-service-worker.html
+++ b/speculation-rules/prerender/resources/fetch-intercepted-by-service-worker.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/file-picker.html b/speculation-rules/prerender/resources/file-picker.html
index 22245a49bcb0cc..d5621a5e18f012 100644
--- a/speculation-rules/prerender/resources/file-picker.html
+++ b/speculation-rules/prerender/resources/file-picker.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/generic-sensor.https.html b/speculation-rules/prerender/resources/generic-sensor.https.html
index 26f4ac7dcdc23e..e41a8e41f2cb03 100644
--- a/speculation-rules/prerender/resources/generic-sensor.https.html
+++ b/speculation-rules/prerender/resources/generic-sensor.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/idle-detection.https.html b/speculation-rules/prerender/resources/idle-detection.https.html
index 4f4554983ac397..f618b8e6f5ff06 100644
--- a/speculation-rules/prerender/resources/idle-detection.https.html
+++ b/speculation-rules/prerender/resources/idle-detection.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/iframe-added-post-activation.html b/speculation-rules/prerender/resources/iframe-added-post-activation.html
index 10a48df58cf9dd..75f56953380b4d 100644
--- a/speculation-rules/prerender/resources/iframe-added-post-activation.html
+++ b/speculation-rules/prerender/resources/iframe-added-post-activation.html
@@ -3,7 +3,6 @@
 <title>iframe added post activation: initiator and prerendered page</title>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <body>
 <script>
diff --git a/speculation-rules/prerender/resources/main-frame-navigation.html b/speculation-rules/prerender/resources/main-frame-navigation.html
index 8781edef6670b4..63f1f2174b9cbf 100644
--- a/speculation-rules/prerender/resources/main-frame-navigation.html
+++ b/speculation-rules/prerender/resources/main-frame-navigation.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/media-autoplay-attribute.html b/speculation-rules/prerender/resources/media-autoplay-attribute.html
index c14df771544e34..bceb2be81a709c 100644
--- a/speculation-rules/prerender/resources/media-autoplay-attribute.html
+++ b/speculation-rules/prerender/resources/media-autoplay-attribute.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <audio id="audio" autoplay loop></audio>
diff --git a/speculation-rules/prerender/resources/media-capabilities-decoding-info.https.html b/speculation-rules/prerender/resources/media-capabilities-decoding-info.https.html
index 5f1523701ea562..b7615051afb3a0 100644
--- a/speculation-rules/prerender/resources/media-capabilities-decoding-info.https.html
+++ b/speculation-rules/prerender/resources/media-capabilities-decoding-info.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/media-capabilities-encoding-info.https.html b/speculation-rules/prerender/resources/media-capabilities-encoding-info.https.html
index 539867824ce845..2d9eceb3d15c55 100644
--- a/speculation-rules/prerender/resources/media-capabilities-encoding-info.https.html
+++ b/speculation-rules/prerender/resources/media-capabilities-encoding-info.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/media-device-info.https.html b/speculation-rules/prerender/resources/media-device-info.https.html
index 14d2ff78c99a36..f384c562486ba9 100644
--- a/speculation-rules/prerender/resources/media-device-info.https.html
+++ b/speculation-rules/prerender/resources/media-device-info.https.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/media-devices-access.https.html b/speculation-rules/prerender/resources/media-devices-access.https.html
index 6739605f03b668..3a1d168cb3da48 100644
--- a/speculation-rules/prerender/resources/media-devices-access.https.html
+++ b/speculation-rules/prerender/resources/media-devices-access.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 
diff --git a/speculation-rules/prerender/resources/media-play.html b/speculation-rules/prerender/resources/media-play.html
index f4c0af9579ceca..c66dc113f8660f 100644
--- a/speculation-rules/prerender/resources/media-play.html
+++ b/speculation-rules/prerender/resources/media-play.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <audio id="audio" loop></audio>
diff --git a/speculation-rules/prerender/resources/message-boxes.html b/speculation-rules/prerender/resources/message-boxes.html
index 8e0a6e874fdf27..b96e2062398861 100644
--- a/speculation-rules/prerender/resources/message-boxes.html
+++ b/speculation-rules/prerender/resources/message-boxes.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script>
 function runAlertTest() {
diff --git a/speculation-rules/prerender/resources/midi.https.html b/speculation-rules/prerender/resources/midi.https.html
index 0cd98a1693f00d..1b3fc683acd438 100644
--- a/speculation-rules/prerender/resources/midi.https.html
+++ b/speculation-rules/prerender/resources/midi.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 
diff --git a/speculation-rules/prerender/resources/navigator-plugins.html b/speculation-rules/prerender/resources/navigator-plugins.html
index dcb9302d8d2dd2..70b9144f939b1e 100644
--- a/speculation-rules/prerender/resources/navigator-plugins.html
+++ b/speculation-rules/prerender/resources/navigator-plugins.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script>
 const params = new URLSearchParams(location.search);
diff --git a/speculation-rules/prerender/resources/notification-before-activation.html b/speculation-rules/prerender/resources/notification-before-activation.html
index 16aab488a57250..7fe2a2e407b0f6 100644
--- a/speculation-rules/prerender/resources/notification-before-activation.html
+++ b/speculation-rules/prerender/resources/notification-before-activation.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/prerender-state.html b/speculation-rules/prerender/resources/prerender-state.html
index 34a59f07ee1c88..3d3cc16f2a8ac6 100644
--- a/speculation-rules/prerender/resources/prerender-state.html
+++ b/speculation-rules/prerender/resources/prerender-state.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/prerendered-iframe.html b/speculation-rules/prerender/resources/prerendered-iframe.html
index dcdfb9b65b9dd4..9b7ac5a7309b15 100644
--- a/speculation-rules/prerender/resources/prerendered-iframe.html
+++ b/speculation-rules/prerender/resources/prerendered-iframe.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>Prerendered iframe</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <body>
 <script>
diff --git a/speculation-rules/prerender/resources/prerendered-page.html b/speculation-rules/prerender/resources/prerendered-page.html
index e6ab00788b2a83..9e4ff13d0e2d69 100644
--- a/speculation-rules/prerender/resources/prerendered-page.html
+++ b/speculation-rules/prerender/resources/prerendered-page.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>Prerendered page</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <body>
 <script>
diff --git a/speculation-rules/prerender/resources/presentation-request.html b/speculation-rules/prerender/resources/presentation-request.html
index 18475a3d67f7d8..e96abc93d5d998 100644
--- a/speculation-rules/prerender/resources/presentation-request.html
+++ b/speculation-rules/prerender/resources/presentation-request.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/prompt-by-before-unload.html b/speculation-rules/prerender/resources/prompt-by-before-unload.html
index 8cfe09a41fe2ac..ced38487ddf9b9 100644
--- a/speculation-rules/prerender/resources/prompt-by-before-unload.html
+++ b/speculation-rules/prerender/resources/prompt-by-before-unload.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <div id="target"></div>
 <iframe id="i" srcdoc="<html><body>Hello</body></html>"></iframe>
diff --git a/speculation-rules/prerender/resources/push.https.html b/speculation-rules/prerender/resources/push.https.html
index 30eb563ab75532..c7c5703d551939 100644
--- a/speculation-rules/prerender/resources/push.https.html
+++ b/speculation-rules/prerender/resources/push.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/register-service-worker.html b/speculation-rules/prerender/resources/register-service-worker.html
index ccdf2205738872..e44dd7a1869cfb 100644
--- a/speculation-rules/prerender/resources/register-service-worker.html
+++ b/speculation-rules/prerender/resources/register-service-worker.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
diff --git a/speculation-rules/prerender/resources/request-picture-in-picture.html b/speculation-rules/prerender/resources/request-picture-in-picture.html
index 360cf3b200760a..15f844231d67d9 100644
--- a/speculation-rules/prerender/resources/request-picture-in-picture.html
+++ b/speculation-rules/prerender/resources/request-picture-in-picture.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <video id="target"
        onloadstart="loadstart()" src="/media/test.webm"></video>
diff --git a/speculation-rules/prerender/resources/sandbox-iframe.html b/speculation-rules/prerender/resources/sandbox-iframe.html
index 478dfccb3ab256..4cb1a26039cce7 100644
--- a/speculation-rules/prerender/resources/sandbox-iframe.html
+++ b/speculation-rules/prerender/resources/sandbox-iframe.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
diff --git a/speculation-rules/prerender/resources/screen-capture.https.html b/speculation-rules/prerender/resources/screen-capture.https.html
index 1304b9d74b0b9b..f38263f22a245e 100644
--- a/speculation-rules/prerender/resources/screen-capture.https.html
+++ b/speculation-rules/prerender/resources/screen-capture.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/screen-orientation-lock.https.html b/speculation-rules/prerender/resources/screen-orientation-lock.https.html
index a152e344900826..44ac4560ba9bcc 100644
--- a/speculation-rules/prerender/resources/screen-orientation-lock.https.html
+++ b/speculation-rules/prerender/resources/screen-orientation-lock.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/service-worker-unregister.html b/speculation-rules/prerender/resources/service-worker-unregister.html
index a78775a5a2c7a5..b689eb7b8d313d 100644
--- a/speculation-rules/prerender/resources/service-worker-unregister.html
+++ b/speculation-rules/prerender/resources/service-worker-unregister.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
diff --git a/speculation-rules/prerender/resources/service-worker-update.html b/speculation-rules/prerender/resources/service-worker-update.html
index d9a9273526efb9..42e93f5588c51c 100644
--- a/speculation-rules/prerender/resources/service-worker-update.html
+++ b/speculation-rules/prerender/resources/service-worker-update.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <body>
diff --git a/speculation-rules/prerender/resources/session-storage-carry-over-to-prerender-page.html b/speculation-rules/prerender/resources/session-storage-carry-over-to-prerender-page.html
index 39df79c84762fd..c31493ff6f80fc 100644
--- a/speculation-rules/prerender/resources/session-storage-carry-over-to-prerender-page.html
+++ b/speculation-rules/prerender/resources/session-storage-carry-over-to-prerender-page.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="session-storage-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/session-storage-isolated-while-prerendering.html b/speculation-rules/prerender/resources/session-storage-isolated-while-prerendering.html
index 46170393deb4ad..cb3dc73b5c73c8 100644
--- a/speculation-rules/prerender/resources/session-storage-isolated-while-prerendering.html
+++ b/speculation-rules/prerender/resources/session-storage-isolated-while-prerendering.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="session-storage-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/session-storage-no-leak-to-initiator-page.html b/speculation-rules/prerender/resources/session-storage-no-leak-to-initiator-page.html
index 6c0ee4c4adbab9..dd7399d2d6a14a 100644
--- a/speculation-rules/prerender/resources/session-storage-no-leak-to-initiator-page.html
+++ b/speculation-rules/prerender/resources/session-storage-no-leak-to-initiator-page.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="session-storage-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/session-storage-swap-after-activate.html b/speculation-rules/prerender/resources/session-storage-swap-after-activate.html
index c5e443721491a7..5227a1742c5154 100644
--- a/speculation-rules/prerender/resources/session-storage-swap-after-activate.html
+++ b/speculation-rules/prerender/resources/session-storage-swap-after-activate.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="session-storage-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/speech-synthesis.https.html b/speculation-rules/prerender/resources/speech-synthesis.https.html
index f7436e42ce4c2e..ba674e0958c801 100644
--- a/speculation-rules/prerender/resources/speech-synthesis.https.html
+++ b/speculation-rules/prerender/resources/speech-synthesis.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script src="webspeech.js"></script>
diff --git a/speculation-rules/prerender/resources/storage-persist.https.html b/speculation-rules/prerender/resources/storage-persist.https.html
index ab5fabd9e3099f..423771c9e676fa 100644
--- a/speculation-rules/prerender/resources/storage-persist.https.html
+++ b/speculation-rules/prerender/resources/storage-persist.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/wake-lock.https.html b/speculation-rules/prerender/resources/wake-lock.https.html
index 4e0d6076a60aa9..7ae8dd06003dab 100644
--- a/speculation-rules/prerender/resources/wake-lock.https.html
+++ b/speculation-rules/prerender/resources/wake-lock.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/web-hid.https.html b/speculation-rules/prerender/resources/web-hid.https.html
index e9531293eadde0..c84050551f1401 100644
--- a/speculation-rules/prerender/resources/web-hid.https.html
+++ b/speculation-rules/prerender/resources/web-hid.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/web-locks.html b/speculation-rules/prerender/resources/web-locks.html
index 621dd18b4db79e..146ba7e1d81a48 100644
--- a/speculation-rules/prerender/resources/web-locks.html
+++ b/speculation-rules/prerender/resources/web-locks.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/web-nfc.https.html b/speculation-rules/prerender/resources/web-nfc.https.html
index 61207ab346db43..8b8d5b1b915a36 100644
--- a/speculation-rules/prerender/resources/web-nfc.https.html
+++ b/speculation-rules/prerender/resources/web-nfc.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/web-serial.https.html b/speculation-rules/prerender/resources/web-serial.https.html
index cfae1372c260d8..7931cd68cefd94 100644
--- a/speculation-rules/prerender/resources/web-serial.https.html
+++ b/speculation-rules/prerender/resources/web-serial.https.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/web-share.https.html b/speculation-rules/prerender/resources/web-share.https.html
index f4e2f304718ef2..b6ec357cbf3700 100644
--- a/speculation-rules/prerender/resources/web-share.https.html
+++ b/speculation-rules/prerender/resources/web-share.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/web-usb.https.html b/speculation-rules/prerender/resources/web-usb.https.html
index 555825a81c530f..56e152e4d4d92e 100644
--- a/speculation-rules/prerender/resources/web-usb.https.html
+++ b/speculation-rules/prerender/resources/web-usb.https.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <script src="/common/utils.js"></script>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/web-xr-immersive-vr-session.https.html b/speculation-rules/prerender/resources/web-xr-immersive-vr-session.https.html
index decb33657a6f69..31aae8ec489d6b 100644
--- a/speculation-rules/prerender/resources/web-xr-immersive-vr-session.https.html
+++ b/speculation-rules/prerender/resources/web-xr-immersive-vr-session.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/web-xr-inline-session.https.html b/speculation-rules/prerender/resources/web-xr-inline-session.https.html
index cde1f15a2ae25f..cb841d87276c91 100644
--- a/speculation-rules/prerender/resources/web-xr-inline-session.https.html
+++ b/speculation-rules/prerender/resources/web-xr-inline-session.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <script>
diff --git a/speculation-rules/prerender/resources/window-move.html b/speculation-rules/prerender/resources/window-move.html
index 0c5888c957e28e..779872f8176034 100644
--- a/speculation-rules/prerender/resources/window-move.html
+++ b/speculation-rules/prerender/resources/window-move.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/window-open-during-prerendering.html b/speculation-rules/prerender/resources/window-open-during-prerendering.html
index a314d5005b3bca..4416a80b131a40 100644
--- a/speculation-rules/prerender/resources/window-open-during-prerendering.html
+++ b/speculation-rules/prerender/resources/window-open-during-prerendering.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/window-open-in-prerenderingchange.html b/speculation-rules/prerender/resources/window-open-in-prerenderingchange.html
index f32126f93d5da7..639bc5c365e2f6 100644
--- a/speculation-rules/prerender/resources/window-open-in-prerenderingchange.html
+++ b/speculation-rules/prerender/resources/window-open-in-prerenderingchange.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/window-resize.html b/speculation-rules/prerender/resources/window-resize.html
index 8b6172ee16ccf8..1d12978385ac99 100644
--- a/speculation-rules/prerender/resources/window-resize.html
+++ b/speculation-rules/prerender/resources/window-resize.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
 <script>
 
diff --git a/speculation-rules/prerender/resources/windowclient-navigate-on-iframe.html b/speculation-rules/prerender/resources/windowclient-navigate-on-iframe.html
index cc49e202c379a5..0e2d15d266c439 100644
--- a/speculation-rules/prerender/resources/windowclient-navigate-on-iframe.html
+++ b/speculation-rules/prerender/resources/windowclient-navigate-on-iframe.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>WindowClient.navigate() on a prerendered iframe</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <body>
diff --git a/tools/lint/lint.py b/tools/lint/lint.py
index 32bc7ece7b12f3..452bb142e8a617 100644
--- a/tools/lint/lint.py
+++ b/tools/lint/lint.py
@@ -385,9 +385,6 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
             not source_file.spec_links):
             return [rules.MissingLink.error(path)]
 
-    if source_file.name_is_non_test:
-        return []
-
     if source_file.markup_type is None:
         return []
 
@@ -456,13 +453,16 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
 
     testharnessreport_nodes: List[ElementTree.Element] = []
     if source_file.testharness_nodes:
-        if test_type not in ("testharness", "manual"):
+        if test_type not in ("testharness", "manual", "support"):
             errors.append(rules.TestharnessInOtherType.error(path, (test_type,)))
         if len(source_file.testharness_nodes) > 1:
             errors.append(rules.MultipleTestharness.error(path))
 
         testharnessreport_nodes = source_file.root.findall(".//{http://www.w3.org/1999/xhtml}script[@src='/resources/testharnessreport.js']")
-        if not testharnessreport_nodes:
+        if test_type == "support":
+            if testharnessreport_nodes:
+                errors.append(rules.TestharnessReportInUnsupportedType.error(path, (test_type,)))
+        elif not testharnessreport_nodes:
             errors.append(rules.MissingTestharnessReport.error(path))
         else:
             if len(testharnessreport_nodes) > 1:
@@ -475,7 +475,7 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
 
     testdriver_vendor_nodes: List[ElementTree.Element] = []
     if source_file.testdriver_nodes:
-        if test_type != "testharness":
+        if test_type not in ("testharness", "support"):
             errors.append(rules.TestdriverInUnsupportedType.error(path, (test_type,)))
 
         if len(source_file.testdriver_nodes) > 1:
diff --git a/tools/lint/rules.py b/tools/lint/rules.py
index 8dba7817a9e563..27c2826ab604cb 100644
--- a/tools/lint/rules.py
+++ b/tools/lint/rules.py
@@ -180,6 +180,11 @@ class MissingTestharnessReport(Rule):
     """
 
 
+class TestharnessReportInUnsupportedType(Rule):
+    name = "TESTHARNESSREPORT-IN-UNSUPPORTED-TYPE"
+    description = "testharnessreport.js included in a %s test"
+
+
 class MultipleTestharnessReport(Rule):
     name = "MULTIPLE-TESTHARNESSREPORT"
     description = "More than one `<script src='/resources/testharnessreport.js'>`"
diff --git a/tools/lint/tests/dummy/about_blank.html b/tools/lint/tests/dummy/ref/about_blank.html
similarity index 100%
rename from tools/lint/tests/dummy/about_blank.html
rename to tools/lint/tests/dummy/ref/about_blank.html
diff --git a/tools/lint/tests/test_lint.py b/tools/lint/tests/test_lint.py
index 8a304bd3694bd8..ae35d0ba4254be 100644
--- a/tools/lint/tests/test_lint.py
+++ b/tools/lint/tests/test_lint.py
@@ -214,7 +214,7 @@ def test_ref_absolute_url(caplog):
 def test_about_blank_as_ref(caplog):
     with _mock_lint("check_path"):
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
-            rv = lint(_dummy_repo, ["about_blank.html"], "normal")
+            rv = lint(_dummy_repo, ["ref/about_blank.html"], "normal")
             assert rv == 0
             assert mocked_check_file_contents.call_count == 1
     assert caplog.text == ""
diff --git a/workers/modules/resources/new-shared-worker-window.html b/workers/modules/resources/new-shared-worker-window.html
index 84564fd7b6e5d2..82b8587cc1705b 100644
--- a/workers/modules/resources/new-shared-worker-window.html
+++ b/workers/modules/resources/new-shared-worker-window.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>SharedWorker: new SharedWorker()</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script>
 let worker;
 
diff --git a/workers/modules/resources/new-worker-window.html b/workers/modules/resources/new-worker-window.html
index 32a89fae0ecd59..8436ad27c82a8e 100644
--- a/workers/modules/resources/new-worker-window.html
+++ b/workers/modules/resources/new-worker-window.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>DedicatedWorker: new Worker()</title>
 <script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <script>
 let worker;
 
diff --git a/worklets/resources/addmodule-window.html b/worklets/resources/addmodule-window.html
index 6263e6ef8ea42a..255adaa978c6e8 100644
--- a/worklets/resources/addmodule-window.html
+++ b/worklets/resources/addmodule-window.html
@@ -3,7 +3,6 @@
 <head>
   <title>Worklet: Referrer</title>
   <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
   <script src="worklet-test-utils.js"></script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <body>
diff --git a/worklets/resources/referrer-window.html b/worklets/resources/referrer-window.html
index 1d8d38b719be8d..374ff011bf71e8 100644
--- a/worklets/resources/referrer-window.html
+++ b/worklets/resources/referrer-window.html
@@ -4,7 +4,6 @@
   <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>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <body>